diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e8ee44c1d76f9bd651aedeac3f6b94d1389db93..a9a35c5cbc482dbe220e3f234c01b17cd3554a1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,25 @@
-image: ralfjung/opam-ci:latest
+image: ralfjung/opam-ci:opam2
 
 stages:
   - build
 
 variables:
   CPU_CORES: "10"
-  GIT_SUBMODULE_STRATEGY: "recursive"
 
 .template: &template
   stage: build
   tags:
   - fp
   script:
+  - git clone https://gitlab.mpi-sws.org/FP/iris-ci.git ci -b opam2
   - ci/buildjob
   cache:
-    key: "iris-3.1-$CI_JOB_NAME"
+    key: "$CI_JOB_NAME-iris-3.1"
     paths:
     - opamroot/
   only:
-  - /^ci/
   - iris-3.1
+  - /^ci/
   except:
   - triggers
   - schedules
diff --git a/ci b/ci
deleted file mode 160000
index c3b53061d2452f7ea50766915eb40312163d155a..0000000000000000000000000000000000000000
--- a/ci
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c3b53061d2452f7ea50766915eb40312163d155a