diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0fe479f..a4b1fc7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,15 +21,23 @@ stages:          # List of stages for jobs, and their order of execution
 
 
 release_job:  
-    stage: release  # It only runs when *both* jobs in the test stage complete successfully.
-    image: registry.gitlab.com/gitlab-org/release-cli:latest
-    script:
-        - echo "Release WPE 2.0_$CI_COMMIT_SHORT_SHA"
-        - rm .gitlab-ci.yml
-        - rm CHANGELOG
-        - rm README.md
 
-    release:
-        tag_name: $CI_COMMIT_SHORT_SHA
-        name: 'WPE 2.0_$CI_COMMIT_SHORT_SHA'
-        description: '$CI_COMMIT_MESSAGE'
\ No newline at end of file
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never                                  # Do not run this job when a tag is created manually
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+
+  stage: release  # It only runs when *both* jobs in the test stage complete successfully.
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+
+  script:
+    - echo "Release WPE 2.0_$CI_COMMIT_SHORT_SHA"
+    - rm -rf .vs
+    - rm .gitlab-ci.yml
+    - rm CHANGELOG
+    - rm README.md
+
+  release:
+    tag_name: v2.0.$CI_PIPELINE_IID
+    name: 'WPE 2.0_$CI_COMMIT_SHORT_SHA'
+    description: '$CI_COMMIT_MESSAGE'
\ No newline at end of file