diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 753b2e3da48589c6e536f16c08564ee4c49d72ed..becd880924067d3ad4b2c7e23a94bdeb239ad083 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ buildDebug:
 test:
   stage: release
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: $CI_MERGE_REQUEST_ID
       when: always
   script:
     - ./gradlew test -PtestAccountName="$testAccountName" -PtestAccountPwd="$testAccountPwd" -PtestServerUrl="$testServerUrl"
@@ -59,7 +59,7 @@ buildRelease:
   stage: release
   allow_failure: false
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: $CI_MERGE_REQUEST_ID 
       when: always
     - if: '$CI_COMMIT_REF_PROTECTED == "true"'
       when: always
@@ -112,7 +112,7 @@ buildReleaseStable:
 lintRelease:
   extends: .lintReleaseDefault
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: $CI_MERGE_REQUEST_ID
       when: always
   script:
     - ./gradlew lintRelease
@@ -127,11 +127,14 @@ publish-authdatalib:
   stage: publish
   needs: ["buildRelease"]
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: $CI_MERGE_REQUEST_ID
+      when: manual
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: manual
   script:
     - ./gradlew :auth-data-lib:build
     - ./gradlew :auth-data-lib:publish
+  allow_failure: true
 
 
 pushToPrebuilt:
@@ -175,10 +178,11 @@ publish-contracts:
   stage: publish
   needs: ["buildRelease"]
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: $CI_MERGE_REQUEST_ID
       when: manual
     - if: '$CI_COMMIT_TAG !~ "/^$/"'
       when: always
   script:
     - ./gradlew :parental-control-data:build
     - ./gradlew :parental-control-data:publish
+  allow_failure: true