diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 851eb0189..8443f91d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,12 +3,13 @@ image: node:18
 variables:
   NODE_ENV: test
 
-cache:
+cache: &cache
   key:
     files:
       - yarn.lock
   paths:
     - node_modules/
+  policy: pull
 
 stages:
   - deps
@@ -21,13 +22,16 @@ deps:
   only:
     changes:
       - yarn.lock
+  cache:
+    <<: *cache
+    policy: push
 
 danger:
   stage: test
-  script: npx danger ci
-  cache: []
-  only:
-    - merge_requests
+  script:
+    # https://github.com/danger/danger-js/issues/1029#issuecomment-998915436
+    - export CI_MERGE_REQUEST_IID=${CI_OPEN_MERGE_REQUESTS#*!}
+    - npx danger ci
 
 lint-js:
   stage: test