diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1876e12441483a1265c3ff8004f83eceebff546..8a622ebfca6dda91d8d97d2e5515139db8acaa80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,17 +26,11 @@ ubuntu22:
   tags:
     - ubuntu22
 
-ubuntu20:
+ubuntu24:
   <<: *do-test
   tags:
-    - ubuntu20
+    - ubuntu24
 
-ubuntu18:
-  <<: *do-test
-  script:
-    - ./cicd_testing/do-clean.sh
-  tags:
-    - ubuntu18
 
 
 arm32:
@@ -57,21 +51,21 @@ coss9:
 #
 # Fuzz
 #
-fuzz:
-  stage: fuzz
-  script:
-    - ./cicd_testing/do-fuzz.sh
-  artifacts:
-    paths: 
-      - artifacts
-    when: always
-  tags:
-    - fuzz
+#fuzz:
+#  stage: fuzz
+#  script:
+#    - ./cicd_testing/do-fuzz.sh
+#  artifacts:
+#    paths: 
+#      - artifacts
+#    when: always
+#  tags:
+#    - fuzz
 
 #
 # Deploy
 #
-ubuntu22:
+deploy:
   stage: deploy
   script:
     - ./cicd_testing/do-deploy.sh