diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7de20984f3776e2b70918322b2bf472062a536ff..c2afc058cec7aabcc0848210a3d93a3b4720521e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ variables:
   tags:
     - bigbang
     - dogfood
+    - generic
 
 .bigbang:
   image: registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates/k3d-builder:0.0.1
diff --git a/.gitlab-ci/jobs/ci-cluster/.gitlab-ci.yml b/.gitlab-ci/jobs/ci-cluster/.gitlab-ci.yml
index 903a991120b0dfef356058013ab4008f23c5ffde..040c23152f3fc8334482b070a736ed6e7b08d6ff 100644
--- a/.gitlab-ci/jobs/ci-cluster/.gitlab-ci.yml
+++ b/.gitlab-ci/jobs/ci-cluster/.gitlab-ci.yml
@@ -4,6 +4,7 @@
 .dind-runner:
   tags:
     - bigbang
+    - umbrella
     - privileged
     - dogfood