diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2770c3c6..a277a335 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,17 @@ delete_test_machine:
   script:
     - /home/gitlab-runner/build-machine-ctl.sh delete amd64-deb
 
+release_job:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest              
+  script:
+    - echo "running release_job"
+  release:                               # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties
+    tag_name: '$CI_COMMIT_TAG'
+    description: '$CI_COMMIT_TAG'
+  rules:
+    - if: '$CI_COMMIT_TAG =~ /v\d.+/'
+
 create_build_machines:
   stage: build_packages
   tags:
@@ -59,7 +70,7 @@ create_build_machines:
     - /home/gitlab-runner/build-machine-ctl.sh create arm64-deb
     - /home/gitlab-runner/build-machine-ctl.sh create amd64-rpm
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/'
+    - if: '$CI_COMMIT_TAG =~ /v\d.+/'
   
 package_amd64_deb:
   stage: build_packages
@@ -72,7 +83,7 @@ package_amd64_deb:
     - earthly +package-linux-amd64-deb
     - /home/gitlab-runner/scp-to-orchestrator.sh
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/'
+    - if: '$CI_COMMIT_TAG =~ /v\d.+/'
 
 package_arm64_deb:
   stage: build_packages
@@ -85,7 +96,7 @@ package_arm64_deb:
     - earthly +package-linux-arm64-deb
     - /home/gitlab-runner/scp-to-orchestrator.sh
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/'
+    - if: '$CI_COMMIT_TAG =~ /v\d.+/'
 
 package_amd64_rpm:
   stage: build_packages
@@ -98,18 +109,7 @@ package_amd64_rpm:
     - earthly +package-linux-amd64-rpm
     - /home/gitlab-runner/scp-to-orchestrator.sh
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/'
-
-release_job:
-  stage: release
-  image: registry.gitlab.com/gitlab-org/release-cli:latest              
-  script:
-    - echo "running release_job"
-  release:                               # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties
-    tag_name: '$CI_COMMIT_TAG'
-    description: '$CI_COMMIT_TAG'
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/'
+    - if: '$CI_COMMIT_TAG =~ /v\d.+/'
 
 build_repositories:
   stage: distribute
@@ -118,7 +118,7 @@ build_repositories:
   script:
     - /home/gitlab-runner/distribute-packages.sh
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/'
+    - if: '$CI_COMMIT_TAG =~ /v\d.+/'
 
 deploy_repos:
   stage: distribute
@@ -129,7 +129,7 @@ deploy_repos:
   script: 
     - /home/gitlab-runner/deploy-repo.sh
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/'
+    - if: '$CCI_COMMIT_TAG =~ /v\d.+/'
 
 delete_build_machines:
   stage: distribute
@@ -140,4 +140,4 @@ delete_build_machines:
     - /home/gitlab-runner/build-machine-ctl.sh delete arm64-deb
     - /home/gitlab-runner/build-machine-ctl.sh delete amd64-rpm
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_BRANCH =~ /v\d.+/'
\ No newline at end of file
+    - if: '$CI_COMMIT_TAG =~ /v\d.+/'
\ No newline at end of file