diff --git a/.cirrus.yml b/.cirrus.yml
index 60535b8..77a2036 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,5 +1,4 @@
 
-# Todo: Codesign fails for local CI, works when steps replicated in VM GUI
 # Run command: `cirrus run --artifacts-dir receivers/electron/out`
 task:
   name: buildReceiverMac
@@ -10,8 +9,12 @@ task:
     - sudo security add-certificates -k /Library/Keychains/System.keychain ./.secure_files/developerID_application.cer
     - security unlock-keychain -p "admin" ~/Library/Keychains/login.keychain
     - security import ./.secure_files/Certificates.p12 -k ~/Library/Keychains/login.keychain -P "$FCAST_CERTIFICATES_PASSWORD" -T /usr/bin/codesign
+    # Keychain ignores access control, causing to prompt for access and failing in CI environments...: https://stackoverflow.com/a/40039594
+    - "security set-key-partition-list -S apple-tool:,apple: -s -k admin ~/Library/Keychains/login.keychain"
+
     - cd receivers/electron
     - npm install
+    - npm rebuild
     - npm run build
     - npm run make -- --platform="darwin" --arch="arm64"
     - npm run make -- --platform="darwin" --arch="x64"
diff --git a/receivers/electron/.gitlab-ci.yml b/receivers/electron/.gitlab-ci.yml
index 6f15e60..2588eab 100644
--- a/receivers/electron/.gitlab-ci.yml
+++ b/receivers/electron/.gitlab-ci.yml
@@ -24,9 +24,12 @@ buildMac:
     - sudo security add-certificates -k /Library/Keychains/System.keychain ./.secure_files/developerID_application.cer
     - security unlock-keychain -p "admin" ~/Library/Keychains/login.keychain
     - security import ./.secure_files/Certificates.p12 -k ~/Library/Keychains/login.keychain -P "$FCAST_CERTIFICATES_PASSWORD" -T /usr/bin/codesign
+    # Keychain ignores access control, causing to prompt for access and failing in CI environments...: https://stackoverflow.com/a/40039594
+    - "security set-key-partition-list -S apple-tool:,apple: -s -k admin ~/Library/Keychains/login.keychain"
     - cd receivers/electron
   script:
     - npm install
+    - npm rebuild
     - npm run build
     - npm run make -- --platform="darwin" --arch="arm64"
     - npm run make -- --platform="darwin" --arch="x64"