diff --git a/container-publish.gitlab-ci.yml b/container-publish.gitlab-ci.yml
index 96c45be..9886d5b 100644
--- a/container-publish.gitlab-ci.yml
+++ b/container-publish.gitlab-ci.yml
@@ -1,5 +1,14 @@
+.container-publish-common-variables: &container-publish-common-variables
+  DOCKER_REGISTRY: $CI_REGISTRY_IMAGE
+  DOCKER_REGISTRY_USER: $CI_REGISTRY_USER
+  DOCKER_REGISTRY_PASSWORD: $CI_REGISTRY_PASSWORD
+  EXTRA_ARGS: ""
+  USE_VERSIONFILE: false
+  ARTIFACT: "version"
+
 .container-publish-common: &container-publish-common
   before_script:
+    - if [ "$USE_VERSIONFILE" == "true" ]; then IMAGE_TAG=$(cat ./"$ARTIFACT"); fi
     - export PARSED_VERSION=$(echo $IMAGE_TAG | sed -r 's/\+/_/g') # Replace + sign since this is not valid in a docker tag
     - echo $PARSED_VERSION
   stage: package
@@ -7,13 +16,10 @@
     - if: $CI_COMMIT_TAG
       variables:
         IMAGE_TAG: $CI_COMMIT_TAG
-
-
-.container-publish-common-variables: &container-publish-common-variables
-  DOCKER_REGISTRY: $CI_REGISTRY_IMAGE
-  DOCKER_REGISTRY_USER: $CI_REGISTRY_USER
-  DOCKER_REGISTRY_PASSWORD: $CI_REGISTRY_PASSWORD
-  EXTRA_ARGS: ""
+    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+      variables:
+        USE_VERSIONFILE: true
+    - when: never
 
 .publish-image-jib-maven:
   image: $MAVEN_IMAGE
diff --git a/documentation/chapters/templates/container-publish.adoc b/documentation/chapters/templates/container-publish.adoc
index e0b5ced..9824c9e 100644
--- a/documentation/chapters/templates/container-publish.adoc
+++ b/documentation/chapters/templates/container-publish.adoc
@@ -17,6 +17,8 @@ Falls das Projekt aus mehreren Poms besteht, kann `before_script:` benutzt werde
 |DOCKER_REGISTRY_USER | Definiert den User der benutzt werden soll | $CI_REGISTRY_USER
 |DOCKER_REGISTRY_PASSWORD | Definiert das Passwort des Benutzers | $CI_REGISTRY_PASSWORD
 |EXTRA_ARGS | Weitere Argumente die an an den jeweiligen Job gegeben werden sollen. | ""
+|USE_VERSIONFILE | Wenn true, dann wird zur Versionierung das ./version file aus dem set-version tool verwendet | "false"
+|ARTIFACT | Der Name des Versionfiles aus dem set-version tool | "version"
 |===
 
 .sonar-template