diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 879abd77adeeabcc786aba38a669a0411ea60d9b..741fda26930bdd0b216614b121fbb2232480b19f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -449,9 +449,8 @@ release-images:
   stage: release
   image: docker:${DOCKER_VERSION}-dind
   only:
-    refs:
-      - dev
-      - /^release-.*/
+    - dev
+    - tags
   dependencies:
     - test-analyse-service
     - test-auth-service-init
@@ -475,8 +474,7 @@ release-helm:
   stage: release
   image: docker:${DOCKER_VERSION}-dind
   only:
-    refs:
-      - /^release-.*/
+    - tags
   when: manual
   needs:
     - build-helm
@@ -504,8 +502,7 @@ release-docs:
   stage: release
   image: docker.io/python:${PYTHON_VERSION}-alpine${ALPINE_VERSION}
   only:
-    refs:
-      - /^release-.*/
+    - tags
   before_script:
     - "apk add --no-cache alpine-sdk bash sed wget openssh jq curl"
     - "pip install pipenv"
@@ -539,8 +536,7 @@ release-libs:
   image: docker.io/python:${PYTHON_VERSION}-alpine${ALPINE_VERSION}
   when: manual
   only:
-    refs:
-      - /^release-.*/
+    - tags
   variables:
     PIPENV_PIPFILE: "./dbrepo-analyse-service/Pipfile"
   before_script:
@@ -555,8 +551,7 @@ verify-install-script:
   image: docker.io/docker:${DOCKER_VERSION}-dind
   stage: verify
   only:
-    refs:
-      - /^release-.*/
+    - tags
   variables:
     SKIP_CHECKS: 1
   before_script:
@@ -568,8 +563,7 @@ verify-dist:
   image: docker.io/alpine:${ALPINE_VERSION}
   stage: verify
   only:
-    refs:
-      - /^release-.*/
+    - tags
   before_script:
     - "apk add curl"
   script:
@@ -579,8 +573,7 @@ deploy-staging:
   image: docker.io/alpine:${ALPINE_VERSION}
   stage: deploy
   only:
-    refs:
-      - dev
+    - dev
   variables:
     KUBECONFIG: ./kubecfg
   environment:
@@ -600,8 +593,7 @@ scan-sonarqube:
   image: sonarsource/sonar-scanner-cli:${SONARQUBE_VERSION}
   stage: scan
   only:
-    refs:
-      - master
+    - $CI_DEFAULT_BRANCH
   script:
     - 'sonar-scanner -Dsonar.token="${CI_SONAR_TOKEN}"'
   allow_failure: true