diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa36366c94e47ad1986ab3b7ba830194385e71fe..22bb84df5eec59d1b0a1eaf512459b8e33eadf9a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -128,11 +128,11 @@ build-fe-node-job:
 #--[ Backend ]------------------------------------------------------------------
 
 # TODO: cache docker layers
-.be-build-job:
+.build-be-job:
   image: docker:20.10.12
   stage: build
   tags:
-    - commul
+    - shared
   services:
     - docker:dind
   variables:
@@ -146,7 +146,7 @@ build-fe-node-job:
       --target production
       --tag=$IMAGE_NAME:${CI_COMMIT_SHA}
       --tag=$IMAGE_NAME:${CI_COMMIT_REF_NAME}
-      --tag=$IMAGE_NAME:${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}
+      --tag=$IMAGE_NAME:${CI_COMMIT_TAG:-latest}
       backend
     - docker image push --all-tags $IMAGE_NAME
   only:
@@ -205,7 +205,7 @@ stg-fe-deploy-job:
     - job: be-build-job
       artifacts: false
   tags:
-    - commul
+    - shared
   variables:
     IMAGE_NAME: $CI_REGISTRY_IMAGE/backend
   before_script:
@@ -213,7 +213,7 @@ stg-fe-deploy-job:
   script:
     - kubectl set image deployment/${K8S_DEPLOYMENT} oetzi=${IMAGE_NAME}:${CI_COMMIT_SHA} --namespace=${K8S_NAMESPACE}
 
-.be-prd-deploy-job:
+prd-be-deploy-job:
   extends: .be-deploy-job
   environment:
     name: production/backend
@@ -225,7 +225,7 @@ stg-fe-deploy-job:
   only:
     - tags
 
-.be-stg-deploy-job:
+stg-be-deploy-job:
   extends: .be-deploy-job
   environment:
     name: staging/backend