diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 245be14..a32946a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
   - dockerize
 
 variables:
-  IMAGE_NAME: ${CI_REGISTRY}/${CI_PROJECT_PATH}
+  IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
 
 build:
   image: node:14-buster
@@ -31,12 +31,12 @@ check:
     - linux
     - docker
   rules:
-    - if: ${CI_COMMIT_TAG}
+    - if: $CI_COMMIT_TAG
   script:
     - checksemver.py -v
-        --versionToValidate "${CI_COMMIT_TAG}"
+        --versionToValidate "$CI_COMMIT_TAG"
         --validateMessage
-        --messageToValidate "${CI_COMMIT_MESSAGE}"
+        --messageToValidate "$CI_COMMIT_MESSAGE"
 
 dockerize:
   image: registry.hottis.de/dockerized/docker-bash:latest
@@ -45,8 +45,10 @@ dockerize:
     - hottis
     - linux
     - docker
+  rules:
+    - if: $CI_COMMIT_TAG
   script:
-    - docker build --tag ${IMAGE_NAME}:latest --tag ${IMAGE_NAME}:$CI_COMMIT_TAG} .
-    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
-    - docker push ${IMAGE_NAME}:latest
-    - docker push ${IMAGE_NAME}:$CI_COMMIT_TAG}
+    - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$CI_COMMIT_TAG .
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker push $IMAGE_NAME:latest
+    - docker push $IMAGE_NAME:$CI_COMMIT_TAG