diff --git a/Dockerfile b/Dockerfile
index b5ec76831..704c1a532 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,7 +66,11 @@ EXPOSE 8443
 USER learn-ocaml
 WORKDIR /home/learn-ocaml
 
+ARG opam_switch="/home/opam/.opam/4.12"
+
 COPY --from=compilation /home/opam/install-prefix /usr
+COPY --from=compilation "$opam_switch/bin"/ocaml* "$opam_switch/bin/"
+COPY --from=compilation "$opam_switch/lib/ocaml" "$opam_switch/lib/ocaml/"
 
 ENTRYPOINT ["dumb-init","/usr/bin/learn-ocaml","--sync-dir=/sync","--repo=/repository"]
 CMD ["build","serve"]
diff --git a/Dockerfile.test-server b/Dockerfile.test-server
index efe90b8cd..dac977241 100644
--- a/Dockerfile.test-server
+++ b/Dockerfile.test-server
@@ -64,7 +64,11 @@ EXPOSE 8443
 USER learn-ocaml
 WORKDIR /home/learn-ocaml
 
+ARG opam_switch="/home/opam/.opam/4.12"
+
 COPY --from=compilation /home/opam/install-prefix /usr
+COPY --from=compilation "$opam_switch/bin"/ocaml* "$opam_switch/bin/"
+COPY --from=compilation "$opam_switch/lib/ocaml" "$opam_switch/lib/ocaml/"
 
 ENTRYPOINT ["dumb-init","/usr/bin/learn-ocaml","--sync-dir=/sync","--repo=/repository"]
 CMD ["build","serve"]