diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2665643..adde71b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,7 +134,6 @@ test_e2e:
   needs:
     - job: dockerimage
       artifacts: false
-    - nomadimage
     - test_e2e
   script:
     # Only replace set env vars
@@ -160,8 +159,10 @@ deploy_review:
     on_stop: stop_review
   only:
     - branches
+    - tags
   except:
     - main
+  when: manual
 
 stop_review:
   # See:
@@ -177,11 +178,12 @@ stop_review:
     action: stop
   needs: []
   allow_failure: true
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "main"'
-      when: never
-    - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH'
-      when: manual
+  only:
+    - branches
+    - tags
+  except:
+    - main
+  when: manual
 
 deploy_staging:
   <<: *start_deployment