diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index c09f1a59217adff6177ee87851bdb867776eec2c..600b50a2326d5d8ac163c6fbbeb1959bf04f3326 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -540,9 +540,9 @@ docker-dind-build:
     - docker images --digests $DOCKER_SNAPSHOT_IMAGE
     # create dotenv file
     - image_with_digest=$(docker inspect --format '{{index .RepoDigests 0}}' "$DOCKER_SNAPSHOT_IMAGE")
-    - docker_digest=${image_with_digest#*@}
-    - docker_repository=${DOCKER_SNAPSHOT_IMAGE%%:*}
-    - docker_tag=${DOCKER_SNAPSHOT_IMAGE#*:}
+    - docker_digest=${image_with_digest##*@}
+    - docker_repository=${DOCKER_SNAPSHOT_IMAGE%:*}
+    - docker_tag=${DOCKER_SNAPSHOT_IMAGE##*:}
     - echo "docker_image=$DOCKER_SNAPSHOT_IMAGE" > docker.env
     - echo "docker_image_digest=$docker_repository@$docker_digest" >> docker.env
     - echo "docker_repository=$docker_repository" >> docker.env
@@ -693,8 +693,8 @@ docker-publish:
       skopeo copy --src-authfile /skopeo/.docker/src-config.json --dest-authfile /skopeo/.docker/dest-config.json ${DOCKER_PUBLISH_ARGS} docker://$DOCKER_SNAPSHOT_IMAGE docker://$DOCKER_RELEASE_IMAGE
       log_info "Well done your image is published and can be downloaded by doing: docker pull $DOCKER_RELEASE_IMAGE"
     - docker_digest=$(skopeo inspect --authfile /skopeo/.docker/dest-config.json --format='{{ .Digest }}' "docker://$DOCKER_RELEASE_IMAGE")
-    - docker_repository=${DOCKER_RELEASE_IMAGE%%:*}
-    - docker_tag=${DOCKER_RELEASE_IMAGE#*:}
+    - docker_repository=${DOCKER_RELEASE_IMAGE%:*}
+    - docker_tag=${DOCKER_RELEASE_IMAGE##*:}
     - echo "docker_image=$DOCKER_RELEASE_IMAGE" > docker.env
     - echo "docker_image_digest=$docker_repository@$docker_digest" >> docker.env
     - echo "docker_repository=$docker_repository" >> docker.env