diff --git a/Dockerfile b/Dockerfile
index 66f08b24..b6995d27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@
 ##                               BUILD ARGS                                   ##
 ################################################################################
 # This build arg allows the specification of a custom Golang image.
-ARG GOLANG_IMAGE=golang:1.21.5
+ARG GOLANG_IMAGE=golang:1.21.5-bullseye
 
 # The distroless image on which the CPI manager image is built.
 #
diff --git a/tools/csi-deps.sh b/tools/csi-deps.sh
index d902ef62..842e4a6d 100755
--- a/tools/csi-deps.sh
+++ b/tools/csi-deps.sh
@@ -96,3 +96,19 @@ cp /bin/btrfs* ${DEST}/bin/
 copy_deps /bin/udevadm
 copy_deps /lib/udev/rules.d
 copy_deps /bin/findmnt
+
+# Edgeless cryptsetup deps
+cp /sbin/dmsetup ${DEST}/sbin/
+mkdir -p ${DEST}/lib/x86_64-linux-gnu/
+mkdir -p ${DEST}/usr/lib/x86_64-linux-gnu/
+cp -Lv /lib/x86_64-linux-gnu/libcryptsetup.so* ${DEST}/lib/x86_64-linux-gnu/
+cp -Lv /lib/x86_64-linux-gnu/libdevmapper.so* ${DEST}/lib/x86_64-linux-gnu/
+cp -Lv /lib/x86_64-linux-gnu/libselinux.so* ${DEST}/lib/x86_64-linux-gnu/
+cp -Lv /lib/x86_64-linux-gnu/libm.so* ${DEST}/lib/x86_64-linux-gnu/
+cp -Lv /usr/lib/x86_64-linux-gnu/libuuid.so* ${DEST}/usr/lib/x86_64-linux-gnu/
+cp -Lv /usr/lib/x86_64-linux-gnu/libcrypto.so* ${DEST}/usr/lib/x86_64-linux-gnu/
+cp -Lv /usr/lib/x86_64-linux-gnu/libargon2.so* ${DEST}/usr/lib/x86_64-linux-gnu/
+cp -Lv /usr/lib/x86_64-linux-gnu/libjson-c.so* ${DEST}/usr/lib/x86_64-linux-gnu/
+cp -Lv /usr/lib/x86_64-linux-gnu/libblkid.so* ${DEST}/usr/lib/x86_64-linux-gnu/
+cp -Lv /usr/lib/x86_64-linux-gnu/libudev.so* ${DEST}/usr/lib/x86_64-linux-gnu/
+cp -Lv /usr/lib/x86_64-linux-gnu/libpcre2-8.so* ${DEST}/usr/lib/x86_64-linux-gnu/