diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6681e0c644f95952b9c3bba622c55d73bb22a77a..9e1fc65d14bbba186f5fe887c880ed749027fa96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,13 +17,12 @@ test-matlab-8.5.0:
     MATLABCMD: matlab850
     TESTCASE: basic-tcv
 
-test-matlab-default:
+test-matlab-9.2.0:
   extends: .test-template
   variables:
-    MATLABCMD: matlab
+    MATLABCMD: matlab920
     TESTCASE: basic-tcv
 
-# comment while genlib for 9.6.0 is not avaiable
 test-matlab-9.6.0:
   extends: .test-template
   tags:
@@ -32,7 +31,6 @@ test-matlab-9.6.0:
     MATLABCMD: matlab960
     TESTCASE: basic-tcv
 
-# Tests with 'all' option deactivated for now since not workin
 test-matlab-8.5.0-all:
   extends: test-matlab-8.5.0
   variables:
@@ -41,6 +39,14 @@ test-matlab-8.5.0-all:
   - schedules
   - web
 
+test-matlab-9.6.0-all:
+  extends: test-matlab-9.6.0
+  variables:
+     TESTCASE: all
+  only:
+  - schedules
+  - web
+
 # Staging, testing and deployment for releases
 pre-deployment-staging:
  extends: .staging-template
@@ -52,11 +58,6 @@ test-staging-960:
  variables:
   MATLABCMD: matlab960
 
-#test-staging-940:
-# extends: .test-staging-template
-# variables:
-#  MATLABCMD: matlab940
-
 test-staging-920:
  extends: .test-staging-template
  variables:
@@ -72,6 +73,11 @@ test-staging-850:
  variables:
   MATLABCMD: matlab850
 
+test-staging-830:
+ extends: .test-staging-template
+ variables:
+  MATLABCMD: matlab830
+
 # pre-deployment
 pre-deployment-checks:
  extends: .pre-deployment-checks-template
@@ -81,13 +87,13 @@ deploy:
   extends: .deploy-to-lac-template
 
 # test post-deploy
-test-post-deploy-matlab:
+test-post-deploy-matlab-9.2.0:
   extends: .test-post-deploy-template
   variables:
-    MATLABCMD: matlab
+    MATLABCMD: matlab920
     TESTCASE: basic-tcv
 
-test-post-deploy-matlab-850:
+test-post-deploy-matlab-8.5.0:
   extends: .test-post-deploy-template
   variables:
     MATLABCMD: matlab850