diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index db8ab15..5fad07c 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: almalinux-8
     container:
       image: git.unkin.net/unkin/almalinux9-actionsdind:latest
-      options: --privileged
+      options: "--privileged --volume /etc/pki/tls/vault:/etc/pki/tls/vault:ro"
 
     steps:
       - name: Checkout code
diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index dc7b96b..35d03e7 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: almalinux-8
     container:
       image: git.unkin.net/unkin/almalinux9-actionsdind:latest
-      options: --privileged
+      options: "--privileged --volume /etc/pki/tls/vault:/etc/pki/tls/vault:ro"
 
     steps:
       - name: Checkout code
diff --git a/Makefile b/Makefile
index 085db0e..dacaa26 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,16 @@ define vault_env
 	mkdir -p $$INCUS_CONFIG_DIR/servercerts && \
 	printf '%s\n' "$$INCUS_CONF_INCUSIMAGES_CERT" > $$INCUS_CONFIG_DIR/servercerts/incus-images.crt && \
 	printf '%s\n' "$$INCUS_CONF_CONFIG_YAML" > $$INCUS_CONFIG_DIR/config.yaml && \
-	printf '%s\n' "$$INCUS_CLIENT_CRT" > $$INCUS_CONFIG_DIR/client.crt && \
-	printf '%s\n' "$$INCUS_CLIENT_KEY" > $$INCUS_CONFIG_DIR/client.key
+	if [ -f /etc/pki/tls/vault/certificate.crt ] && [ -f /etc/pki/tls/vault/private.key ]; then \
+		cp /etc/pki/tls/vault/certificate.crt $$INCUS_CONFIG_DIR/client.crt && \
+		cp /etc/pki/tls/vault/private.key $$INCUS_CONFIG_DIR/client.key; \
+	elif [ -f $$HOME/.config/incus/client.crt ] && [ -f $$HOME/.config/incus/client.key ]; then \
+		cp $$HOME/.config/incus/client.crt $$INCUS_CONFIG_DIR/client.crt && \
+		cp $$HOME/.config/incus/client.key $$INCUS_CONFIG_DIR/client.key; \
+	else \
+		printf '%s\n' "$$INCUS_CLIENT_CRT" > $$INCUS_CONFIG_DIR/client.crt && \
+		printf '%s\n' "$$INCUS_CLIENT_KEY" > $$INCUS_CONFIG_DIR/client.key; \
+	fi
 endef
 
 clean: