diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1876e12441483a1265c3ff8004f83eceebff546..38401560d4ab602b914ea3d71ac55ed616eeb1ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,9 +18,7 @@ stages:
     - ./cicd_testing/do-build.sh
     - ./cicd_testing/do-test.sh
 
-#
-# test
-#
+
 ubuntu22:
   <<: *do-test
   tags:
@@ -31,13 +29,6 @@ ubuntu20:
   tags:
     - ubuntu20
 
-ubuntu18:
-  <<: *do-test
-  script:
-    - ./cicd_testing/do-clean.sh
-  tags:
-    - ubuntu18
-
 
 arm32:
   <<: *do-test
@@ -71,7 +62,8 @@ fuzz:
 #
 # Deploy
 #
-ubuntu22:
+deploy:
+  needs: [ "arm32", "arm64", "coss9", "ubuntu20", "ubuntu22", "fuzz"]
   stage: deploy
   script:
     - ./cicd_testing/do-deploy.sh