diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 878338af7fed803c6ec62f2b3c7ee809de951bec..d785144b92d975b81b73ac92f497985b8eb8da4d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,11 +23,13 @@
     stage: tag
     script:
       - devenv shell tag-version
-    except:
-      - tags
+        
     rules:
-      - if: '$CI_COMMIT_MESSAGE =~ /NOT_TAGIT/'
+      - if: '$CI_COMMIT_TAG'
         when: never
+      - if: '$CI_COMMIT_MESSAGE =~ /NOT_TAGIT/'
+        when: never              
+        
 
   release:
     tags:
diff --git a/devenv.nix b/devenv.nix
index cd6131c4280f53ee8f499b134035209b20d33896..f2545af5dd9432c2e22a1396f2d4f4f251c69fe2 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -126,11 +126,13 @@
           stage: tag
           script:
             - devenv shell tag-version
-          except:
-            - tags
+              
           rules:
-            - if: '$CI_COMMIT_MESSAGE =~ /NOT_TAGIT/'
+            - if: '$CI_COMMIT_TAG'
               when: never
+            - if: '$CI_COMMIT_MESSAGE =~ /NOT_TAGIT/'
+              when: never              
+              
 
         release:
           tags: