diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09c452c..aaef802 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,10 +63,9 @@ include:
 
 Update Deployment:
   image: busybox:ubuntu
-  only:
-    - on_success
   rules:
     - if: '$CI_COMMIT_TAG'
+      when: on_success
   stage: Update Deployment
   script: |
     echo "## Do not edit this file directly. It is auto-generated by the script." > argocd/deployment/deployment.yml
@@ -78,13 +77,12 @@ Update Deployment:
 
 Create Commit:
   stage: Create Commit
-  only:
-    - on_success
+  rules:
+    - if: '$CI_COMMIT_TAG'
+      when: on_success
   dependencies:
     - Update Deployment
   image: alpine:3.18
-  rules:
-    - if: '$CI_COMMIT_TAG'
   before_script: |
     git config --global user.name "${GITLAB_USER_NAME}"
     git config --global user.email "${GITLAB_USER_EMAIL}"
@@ -100,10 +98,9 @@ Create Merge Request:
   dependencies:
     - Create Commit
   image: alpine:3.18
-  only:
-    - on_success
   rules:
     - if: '$CI_COMMIT_TAG'
+      when: on_success
   script: |
     curl --request POST --header "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \
       --data "source_branch=update-deployment-${CI_COMMIT_TAG}" \