diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28fcf4be..93791d05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,18 +89,15 @@ ci:
   services:
     - docker:dind
   script:
-    - export REGISTRY_BRANCH=$(.gitlab/ci/getRegistryBranch.sh "$CI_JOB_NAME")
-    - export VERSION=$(.gitlab/ci/getRegistryTag.sh "$CI_COMMIT_REF_NAME")
     - export CORE_VERSION=$(openstapps-projectmanagement get-used-version @openstapps/core)
-    - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE/$REGISTRY_BRANCH
+    - export VERSION=$(echo -n "$CI_BUILD_REF_NAME" | cut -c 2-)
+    - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE
     - export IMAGETAG_CORE_VERSION=$IMAGETAG_BASE:core-$CORE_VERSION
     - export IMAGETAG_VERSION=$IMAGETAG_BASE:$VERSION
     - export IMAGETAG_LATEST=$IMAGETAG_BASE:latest
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
     - docker build -t $IMAGETAG_LATEST -t $IMAGETAG_VERSION -t $IMAGETAG_CORE_VERSION .
-    - docker push $IMAGETAG_VERSION
-    - docker push $IMAGETAG_CORE_VERSION
-    - .gitlab/ci/pushAsLatestVersion.sh "$CI_COMMIT_REF_NAME" "$IMAGETAG_BASE"
+    - docker push $IMAGETAG_BASE
   only:
     - /(^v[0-9]+\.[0-9]+\.[0-9]+$|^master$|^develop$)/
   tags:
@@ -118,10 +115,13 @@ ci:
   services:
     - docker:dind
   script:
-    - export REGISTRY_BRANCH=$(.gitlab/ci/getRegistryBranch.sh "$CI_JOB_NAME")
+    - export CORE_VERSION=$(openstapps-projectmanagement get-used-version @openstapps/core)
+    - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME
+    - export IMAGETAG_CORE_VERSION=$IMAGETAG_BASE:core-$CORE_VERSION
+    - export IMAGETAG_LATEST=$IMAGETAG_BASE:latest
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-    - docker build -t $CI_REGISTRY_IMAGE/$REGISTRY_BRANCH/$CI_COMMIT_REF_NAME:latest .
-    - docker push $CI_REGISTRY_IMAGE/$REGISTRY_BRANCH/$CI_COMMIT_REF_NAME:latest
+    - docker build -t $IMAGETAG_LATEST -t $IMAGETAG_CORE_VERSION .
+    - docker push $IMAGETAG_BASE
   except:
     - /(^v[0-9]+\.[0-9]+\.[0-9]+$|^master$|^develop$)/
   only:
@@ -130,69 +130,25 @@ ci:
   tags:
     - gitlab-org-docker
 
-
-# Anchor templates for custom build processes
-.build_template_b-tu: &build_template_b-tu
-  # before_script:
-  #  - npm install "@stapps/b-tu-feedback@0.13.1"
-  #  - npm install "@stapps/b-tu-tickets@0.13.1"
-  #  - npm install "@stapps/b-tu-isbn-availability@0.13.1"
-  tags:
-    - gitlab-org-docker
-
-.build_template_f-u: &build_template_f-u
-  # before_script:
-  #  - npm install "git+ssh://git@gitlab.tubit.tu-berlin.de:stapps-f-u/feedback.git#1.0.0"
-  #  - npm install "git+ssh://git@gitlab.tubit.tu-berlin.de:stapps-f-u/dish-feedback.git#1.0.0"
-  tags:
-    - gitlab-org-docker
-
+#.build_template_f-u: &build_template_f-u
+#  before_script:
+#    - Do what you gotta do
+#  tags:
+#    - gitlab-org-docker
 
 # Jobs joining anchor templates with automatic publishing behaviour
 # ! The jobname must end with ":" followed by the name for the registry branch
-publish:default:
+publish:generic:
   <<: *publish_template_auto
 
-publish:ab-fh:
-  <<: *publish_template_auto
-
-publish:b-tu:
-  <<: *publish_template_auto
-  <<: *build_template_b-tu
-
-publish:f-u:
-  <<: *publish_template_auto
-  <<: *build_template_f-u
-
-publish:gi-fh:
-  <<: *publish_template_auto
-
-publish:gi-u:
-  <<: *publish_template_auto
-
-publish:ks-ug:
-  <<: *publish_template_auto
+#publish:f-u:
+#  <<: *publish_template_auto
+#  <<: *build_template_f-u
 
 # Jobs joining anchor templates with manual publishing behaviour
-custom:default:
+custom:generic:
   <<: *publish_template_manual
 
-custom:ab-fh:
-  <<: *publish_template_manual
-
-custom:b-tu:
-  <<: *publish_template_manual
-  <<: *build_template_b-tu
-
-custom:f-u:
-  <<: *publish_template_manual
-  <<: *build_template_f-u
-
-custom:gi-fh:
-  <<: *publish_template_manual
-
-custom:gi-u:
-  <<: *publish_template_manual
-
-custom:ks-ug:
-  <<: *publish_template_manual
+#custom:f-u:
+#  <<: *publish_template_manual
+#  <<: *build_template_f-u