diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8020069..91def74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,7 +77,7 @@ generate-defectdojo-api:
     - docker
     - bash
   rules:
-    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "production_deployment"'
   script:
     - docker build --build-arg ADDITIONAL_CA_URL="$KROHNE_CA_URL"
                    --build-arg ADDITIONAL_CA_CHECKSUM=$KROHNE_CA_CHECKSUM
@@ -133,9 +133,8 @@ dockerize-server:
 
 deploy-test:
   extends: .deploy
-  only:
-    refs:
-      - main
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
   tags:
     -  test-deployment-de01rdtst01
   variables:
@@ -145,9 +144,8 @@ deploy-test:
 
 deploy-dev:
   extends: .deploy
-  only:
-    refs:
-      - production_deployment
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "production_deployment"'
   tags:
     - for-common-services-prod-deployment-only
   variables: