diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index daaa5dc2e93a..291c9955ad8a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -188,18 +188,16 @@ before_script:
   extends: .auto-use-tags
   script:
     - ulimit -S -s 16384           # For flambda + native
-    - make -f Makefile.ci -j "$NJOBS" "$(echo ${CI_JOB_NAME#*:} | sed -e 's/+.*$//')"
+    # set CI_TARGETS from job name if not already provided, then print
+    - echo CI_TARGETS = ${CI_TARGETS:=${CI_JOB_NAME#*:ci-}}
+    - for target in $CI_TARGETS; do dev/ci/ci-wrapper.sh "$target"; done
   after_script:
     - dev/tools/list-potential-artifacts.sh > available_artifacts.txt
     - dev/tools/cleanup-artifacts.sh downloaded_artifacts.txt available_artifacts.txt
   artifacts:
     name: "$CI_JOB_NAME"
     paths:
-      - _build_ci
-      - stdlib/_build
-    exclude: # reduce artifact size
-      - _build_ci/**/.git # exclude .git directory itself as well
-      - _build_ci/**/.git/**/*
+      - _install_ci
     when: always
     expire_in: 1 week
   needs:
@@ -946,6 +944,8 @@ library:ci-stdlib:
 
 library:ci-stdlib+flambda:
   extends: .ci-template-flambda
+  variables:
+    CI_TARGETS: "stdlib"
 
 library:ci-stdlib_test:
   extends: .ci-template
@@ -1032,6 +1032,8 @@ library:ci-http:
   - library:ci-itree_io
   - plugin:ci-quickchick
   stage: build-3+
+  variables:
+    CI_TARGETS: "ceres parsec json async_test http"
 
 library:ci-trakt:
   extends: .ci-template-flambda
@@ -1055,6 +1057,7 @@ plugin:ci-atbr:
   - build:edge+flambda
   - library:ci-stdlib+flambda
 
+# XXX does this actually need stdlib? Makefile.ci says no
 plugin:ci-autosubst_ocaml:
   extends: .ci-template-flambda
   needs:
@@ -1096,6 +1099,8 @@ plugin:ci-elpi_hb:
   needs:
   - build:edge+flambda
   - library:ci-stdlib+flambda
+  variables:
+    CI_TARGETS: "elpi hb"
 
 plugin:ci-elpi_test:
   extends: .ci-template-flambda
@@ -1153,6 +1158,8 @@ plugin:ci-mtac2:
   needs:
   - build:edge+flambda
   - library:ci-stdlib+flambda
+  variables:
+    CI_TARGETS: "unicoq mtac2"
 
 plugin:ci-paramcoq:
   extends: .ci-template-flambda
@@ -1164,7 +1171,7 @@ plugin:ci-perennial:
   extends: .ci-template-flambda
   needs:
   - build:edge+flambda
-  - library:ci-stdlib
+  - library:ci-stdlib+flambda
 
 plugin:plugin-tutorial:
   stage: build-0
diff --git a/dev/tools/cleanup-artifacts.sh b/dev/tools/cleanup-artifacts.sh
index 8ea6c6e148c2..eb78ddde8834 100755
--- a/dev/tools/cleanup-artifacts.sh
+++ b/dev/tools/cleanup-artifacts.sh
@@ -8,8 +8,6 @@ awk 'BEGIN{while( (getline k < "'"$before"'")>0 ){a[k]}} $0 in a' "$after" > rem
 
 xargs -a removed_artifacts.txt rm
 
-for d in _build_ci stdlib/_build; do
-  if [ -d $d ]; then
-    find $d -type d -empty -delete
-  fi
-done
+if [ -d _install_ci ]; then
+  find $d -type d -empty -delete
+fi
diff --git a/dev/tools/list-potential-artifacts.sh b/dev/tools/list-potential-artifacts.sh
index 47433f72f257..b0df0cb7e114 100755
--- a/dev/tools/list-potential-artifacts.sh
+++ b/dev/tools/list-potential-artifacts.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-for d in _build_ci stdlib/_build; do
-  if [ -d $d ]; then
-    find $d -type f -o -type l | sort
-  fi
-done
+if [ -d _install_ci ]; then
+  find _install_ci -type f -o -type l | sort
+fi