diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml
index 69e8a3ccd41f0aed3ab01abd6c64ded93c78afd9_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw=..65aef8de094c38e78b73d651ae1eb12468580b79_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw= 100644
--- a/gitlab-ci-config/dev-gitlab-org.yml
+++ b/gitlab-ci-config/dev-gitlab-org.yml
@@ -599,4 +599,5 @@
 RAT-Nightly:
   stage: slow_jobs
   image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
+  when: manual
   script:
@@ -602,3 +603,2 @@
   script:
-    - '[[ -n "${NIGHTLY}" ]] || exit 0'
     - bundle exec rake qa:rat:nightly
@@ -604,3 +604,2 @@
     - bundle exec rake qa:rat:nightly
-  <<: *dev-ee-nightly-only
   cache: *branch-cache
@@ -606,5 +605,5 @@
   cache: *branch-cache
-  dependencies: []
+  needs: []
   allow_failure: true
 
 ############################
@@ -1005,5 +1004,8 @@
 RAT-Tag:
   stage: slow_jobs
   image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
+  when: manual
+  variables:
+    CI_COMMIT_TAG: "1.2.3"
   script:
     - bundle exec rake qa:rat:tag
@@ -1008,4 +1010,3 @@
   script:
     - bundle exec rake qa:rat:tag
-  <<: *dev-ee-tag-only
   cache: *tag-cache
@@ -1011,5 +1012,5 @@
   cache: *tag-cache
-  dependencies: []
+  needs: []
   allow_failure: true
 
 Raspberry-Pi-2-Buster: