diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4067007..66ceef4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,12 +11,7 @@ stages:
 
 variables:
   IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
-  IMAGE_LATEST: $CI_REGISTRY_IMAGE:develop
-
-rules:
-  - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    variables:
-      IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest
+  IMAGE_LATEST: $CI_REGISTRY_IMAGE:develop       
 
 
 .node:
@@ -25,6 +20,11 @@ rules:
 
 .docker:
   image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:20
+  rules:
+  - if: $CI_COMMIT_TAG
+  - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TAG
+    variables:
+      IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest
 
 
 linter:
@@ -49,8 +49,8 @@ build:
     expire_in: 30 mins
     paths:
       - docker.tar
-  only: 
-    - tags
+  rules:
+    - !reference [.docker, rules]
 
 
 push:
@@ -66,5 +66,5 @@ push:
     - docker tag $IMAGE_TAG $IMAGE_LATEST
     - docker push $IMAGE_TAG
     - docker push $IMAGE_LATEST
-  only: 
-    - tags
+  rules:
+    - !reference [.docker, rules]