diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16c46451f426e3de091be6d559eb0539b3648ec8..6f0438c017463cc524b6af38f5f6b12915c2d768 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,8 @@ unittest:
 
 jsbuild:
   stage: jsbuild
-  when: manual
+  rules:
+    - if: $CI_COMMIT_TAG
   image: node:12
   allow_failure: false
 
@@ -65,6 +66,7 @@ build:
         --timeout 15m0s \
         --set "backend.tag=${CI_COMMIT_TAG}" \
         --set "ingress.host=${HOST}" \
+        $AUX \
         keys chart
   rules:
     - if: $CI_COMMIT_TAG
@@ -74,12 +76,14 @@ deploy_staging:
   variables:
     HOST: keys.preview.sauerburger.com
     NAMESPACE: keys-staging
+    AUX: "--set ingress.openpggkeys='[]'"
   environment:
     name: Staging Environment
     url: https://keys.preview.sauerburger.com/
 
 deploy_production:
   extends: .deploy
+  when: manual
   variables:
     HOST: keys.sauerburger.com
     NAMESPACE: keys