diff --git a/NodeApp/.gitlab-ci/02_templates.yml b/NodeApp/.gitlab-ci/02_templates.yml
index 41ca52ff2ee29ca7b5adc9f7483c279d35c21b81..828f2739126784378c409ab38d42a9473d7c78b0 100644
--- a/NodeApp/.gitlab-ci/02_templates.yml
+++ b/NodeApp/.gitlab-ci/02_templates.yml
@@ -56,7 +56,7 @@
             - $ARTIFACTS_FOLDER/*
         expire_in: 10 mins
     rules:
-        -   if: '$CI_COMMIT_REF_PROTECTED == "true"'
+        -   if: $CI_COMMIT_REF_PROTECTED == "true"
 
 
 .pkg_and_sign:macos:
@@ -90,4 +90,4 @@
             - $ARTIFACTS_FOLDER/*
         expire_in: 10 mins
     rules:
-        -   if: '$CI_COMMIT_REF_PROTECTED == "true"'
\ No newline at end of file
+        -   if: $CI_COMMIT_REF_PROTECTED == "true"
\ No newline at end of file
diff --git a/NodeApp/.gitlab-ci/06_stageBuild.yml b/NodeApp/.gitlab-ci/06_stageBuild.yml
index f1aeaa2e13cd5e49b54436ee79fcf96cc86d0cc8..322912d428fd17654ce5f4833bc98399f72dfe86 100644
--- a/NodeApp/.gitlab-ci/06_stageBuild.yml
+++ b/NodeApp/.gitlab-ci/06_stageBuild.yml
@@ -20,4 +20,5 @@ build:version:
             - $ARTIFACTS_FOLDER/*
         expire_in: 10 mins
     rules:
-        -   if: '$CI_COMMIT_REF_PROTECTED == "true" || $CI_COMMIT_BRANCH == "test"'
+        -   if: $CI_COMMIT_REF_PROTECTED == "true"
+        -   if: $CI_COMMIT_BRANCH == "test"
diff --git a/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml b/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml
index 9bc92c1271d8a4c5bbb38da65297a0637eaaf192..be2b3baea3811d354c555a6d2166faff614c4483 100644
--- a/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml
+++ b/NodeApp/.gitlab-ci/07_stagePkgAndSign.yml
@@ -19,7 +19,7 @@ pkg_and_sign:debian:test:
     artifacts:
         expire_in: 2 weeks
     rules:
-        -   if: '$CI_COMMIT_BRANCH == "test"'
+        -   if: $CI_COMMIT_BRANCH == "test"
 
 
 pkg_and_sign:macos:
@@ -37,7 +37,7 @@ pkg_and_sign:macos:test:
     artifacts:
         expire_in: 2 weeks
     rules:
-        -   if: '$CI_COMMIT_BRANCH == "test"'
+        -   if: $CI_COMMIT_BRANCH == "test"
 
 
 
diff --git a/NodeApp/.gitlab-ci/08_stageClean.yml b/NodeApp/.gitlab-ci/08_stageClean.yml
index ef5ae4c248e0caf6c90cd69f6c7f089ec0347078..8954bd7224bd9bc358e147ab60393f53d509a590 100644
--- a/NodeApp/.gitlab-ci/08_stageClean.yml
+++ b/NodeApp/.gitlab-ci/08_stageClean.yml
@@ -8,7 +8,7 @@ clean:release:
         - !reference [ .get_version_dependent_vars, script ]
         - !reference [ .clean_release, script ]
     rules:
-        -   if: '$CI_COMMIT_REF_PROTECTED == "true"'
+        -   if: $CI_COMMIT_REF_PROTECTED == "true"
 
 
 clean:packages:
@@ -21,7 +21,7 @@ clean:packages:
         - !reference [ .get_version_dependent_vars, script ]
         - !reference [ .clean_packages, script ]
     rules:
-        -   if: '$CI_COMMIT_REF_PROTECTED == "true"'
+        -   if: $CI_COMMIT_REF_PROTECTED == "true"
 
 
 clean:release:dev:
@@ -35,7 +35,7 @@ clean:release:dev:
         - !reference [ .get_version_dependent_vars, script ]
         - !reference [ .clean_release, script ]
     rules:
-        -   if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+        -   if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
 
 clean:packages:dev:
@@ -49,7 +49,7 @@ clean:packages:dev:
         - !reference [ .get_version_dependent_vars, script ]
         - !reference [ .clean_packages, script ]
     rules:
-        -   if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+        -   if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
 
 clean:release:latest:
@@ -61,7 +61,7 @@ clean:release:latest:
         - VERSION="Latest"
         - !reference [ .clean_release, script ]
     rules:
-        -   if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+        -   if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
 
 clean:release:pre-alpha:
@@ -73,4 +73,6 @@ clean:release:pre-alpha:
         - VERSION="Pre-alpha"
         - !reference [ .clean_release, script ]
     rules:
-        -   if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
\ No newline at end of file
+        -   if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+            when: never
+        -   if: $CI_COMMIT_REF_PROTECTED == "true"
\ No newline at end of file
diff --git a/NodeApp/.gitlab-ci/09_stageUpload.yml b/NodeApp/.gitlab-ci/09_stageUpload.yml
index fac7c20fc3fff7648f4fe46b42a689d82e188149..7d50365f4dda4a6af7c36d127d2287ebbf0e76c9 100644
--- a/NodeApp/.gitlab-ci/09_stageUpload.yml
+++ b/NodeApp/.gitlab-ci/09_stageUpload.yml
@@ -27,7 +27,7 @@ upload:packages:
         - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${BIN_FILE_WINDOWS_ARM64} "${PACKAGE_URL_WINDOWS_ARM64_BIN}";'
         - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${BIN_FILE_WINDOWS_X64} "${PACKAGE_URL_WINDOWS_X64_BIN}";'
     rules:
-        -   if: '$CI_COMMIT_REF_PROTECTED == "true"'
+        -   if: $CI_COMMIT_REF_PROTECTED == "true"
 
 
 upload:packages:doc:wiki:
@@ -51,4 +51,4 @@ upload:packages:doc:wiki:
         # Send package
         - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${WIKI_ARCHIVE_PATH} "${PACKAGE_URL_WIKI}";'
     rules:
-        -   if: '$CI_COMMIT_REF_PROTECTED == "true"'
\ No newline at end of file
+        -   if: $CI_COMMIT_REF_PROTECTED == "true"
\ No newline at end of file
diff --git a/NodeApp/.gitlab-ci/10_stageRelease.yml b/NodeApp/.gitlab-ci/10_stageRelease.yml
index 3485a45f772507ac38249dfe7c8ddea337b687a0..e48306feedb7b625fc12e9a6f0a61d446d87d02f 100644
--- a/NodeApp/.gitlab-ci/10_stageRelease.yml
+++ b/NodeApp/.gitlab-ci/10_stageRelease.yml
@@ -44,7 +44,7 @@ release:doc:wiki:
         # Push the change back to the master branch of the wiki
         - git push origin "HEAD:main"
     rules:
-        -   if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+        -   if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
 
 release:gitlab:
@@ -58,7 +58,7 @@ release:gitlab:
         - RELEASE_NAME=$VERSION
         - !reference [ .release_gitlab, script ]
     rules:
-        -   if: '$CI_COMMIT_REF_PROTECTED == "true"'
+        -   if: $CI_COMMIT_REF_PROTECTED == "true"
 
 
 release:gitlab:latest:
@@ -72,7 +72,7 @@ release:gitlab:latest:
         - RELEASE_NAME="Latest"
         - !reference [ .release_gitlab, script ]
     rules:
-        -   if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+        -   if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
 
 release:gitlab:pre-alpha:
@@ -86,4 +86,6 @@ release:gitlab:pre-alpha:
         - RELEASE_NAME="Pre-alpha"
         - !reference [ .release_gitlab, script ]
     rules:
-        -   if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
\ No newline at end of file
+        -   if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+            when: never
+        -   if: $CI_COMMIT_REF_PROTECTED == "true"
\ No newline at end of file