diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9cfeb6e43b6ffeb5a17aaa29fb60a340401e45a..5db1171f0a74cd1b545ff148507edd637252d169 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,8 +21,15 @@ test-matlab:
   variables:
     MATLABCMD: matlab
     TESTCASE: basic-tcv
+    
+# deactivate others for now pending full deployment scripts
 
-test-matlab850-all:
+.test-deployed-matlab850:
+  extends: .test-deployed-template
+  variables:
+    MATLABCMD: matlab850
+
+.test-matlab850-all:
   extends: test-matlab850
   variables:
      TESTCASE: all
@@ -30,15 +37,10 @@ test-matlab850-all:
   - schedules
   - web
 
-deploy: 
+.deploy: 
   extends: .deploy-to-lac-template
 
-test-matlab850-deployed:
-  extends: .test-template-deployed
-  variables:
-    MATLABCMD: matlab850
-
-test-matlab-deployed:
-  extends: .test-template-deployed
+.test-post-deploy:
+  extends: .test-post-deploy-template
   variables:
     MATLABCMD: matlab