diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5261d1e7b2da6668ebe25461ad3c0ee03b841d68..878338af7fed803c6ec62f2b3c7ee809de951bec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,10 +23,11 @@
     stage: tag
     script:
       - devenv shell tag-version
-    only:
-      - master
     except:
       - tags
+    rules:
+      - if: '$CI_COMMIT_MESSAGE =~ /NOT_TAGIT/'
+        when: never
 
   release:
     tags:
diff --git a/devenv.nix b/devenv.nix
index 68c60965aea050cd405dd7eec77840b75299baeb..cd6131c4280f53ee8f499b134035209b20d33896 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -126,10 +126,11 @@
           stage: tag
           script:
             - devenv shell tag-version
-          only:
-            - master
           except:
             - tags
+          rules:
+            - if: '$CI_COMMIT_MESSAGE =~ /NOT_TAGIT/'
+              when: never
 
         release:
           tags:
@@ -308,11 +309,11 @@ in {
       
       sed -i "s/version\s*=\s*\".*\"/version=\"''${NEWVERSION}\"/" ${config.devenv.root}/project.nix
       ${pkgs.git}/bin/git add ${config.devenv.root}/project.nix
-      ${pkgs.git}/bin/git commit -m "chore: Bump version to ''${NEWVERSION}"
+      ${pkgs.git}/bin/git commit -m "chore: Bump version to ''${NEWVERSION} (NOT_TAGIT)"
       
       ${pkgs.git}/bin/git log --decorate=short --pretty=oneline
       
-      ${pkgs.git}/bin/git tag -a "''${NEWVERSION}" -m "chore: Release ''${NEWVERSION}"
+      ${pkgs.git}/bin/git tag -a "''${NEWVERSION}" -m "chore: Release ''${NEWVERSION} (NOT_TAGIT)"
       ${pkgs.git}/bin/git push origin $CI_COMMIT_REF_NAME --tags
 
   '';