diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24d2bb5dd3db45e733d64d3416acb25b541d2ecb..c49c387e2eba51352e68323f21f1de4e281bf4b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,10 +3,8 @@ image: docker:24
 
 
 build:
-  except:
-    - base-common
   rules:
-    - when: on_success
+    - if: $CI_COMMIT_BRANCH != "base-common"
   stage: build
   needs: []
   before_script:
@@ -33,10 +31,8 @@ build:
 
 
 .deploy:
-  except:
-    - base-common
   rules:
-    - when: on_success
+    - if: $CI_COMMIT_BRANCH != "base-common"
   stage: deploy
   needs:
     - "build"
@@ -107,8 +103,8 @@ deploy-example:
 
 
 delete-example:
-  except:
-    - base-common
+  rules:
+    - if: $CI_COMMIT_BRANCH != "base-common"
   stage: deploy
   needs: []
   when: manual
@@ -128,8 +124,8 @@ delete-example:
 
 
 .log-fetcher:
-  except:
-    - base-common
+  rules:
+    - if: $CI_COMMIT_BRANCH != "base-common"
   stage: deploy
   needs: []
   when: manual
@@ -168,8 +164,8 @@ log-fetcher-in-dev:
 
 
 .upload-from-fex-to-somewhere:
-  except:
-    - base-common
+  rules:
+    - if: $CI_COMMIT_BRANCH != "base-common"
   stage: deploy
   needs: []
   when: manual