diff --git a/deploy/infrabox/templates/function_crd.yaml b/deploy/infrabox/templates/function_crd.yaml
index f1b5b9044..3c641f4b6 100644
--- a/deploy/infrabox/templates/function_crd.yaml
+++ b/deploy/infrabox/templates/function_crd.yaml
@@ -36,8 +36,11 @@ spec:
 {{ end }}
 {{- if .Values.job.docker_config_secret }}
     -
-        mountPath: /root/.docker
+        mountPath: /tmp/docker-secret
         name: docker-config
+    -
+        name: docker-dir
+        mountPath: /root/.docker
 {{ end }}
     -
         name: data-dir
@@ -51,16 +54,19 @@ spec:
     -
         name: data-dir
         emptyDir: {}
-    -
-        name: dockerd-config
-        configMap:
-            name: infrabox-dockerd-config
 {{- if .Values.job.docker_config_secret }}
+    -
+        name: docker-dir
+        emptyDir: {}
     -
         name: docker-config
         secret:
             secretName: {{ .Values.job.docker_config_secret }}
 {{ end }}
+    -
+        name: dockerd-config
+        configMap:
+            name: infrabox-dockerd-config
 {{ if .Values.local_cache.enabled }}
     -
         name: local-cache
diff --git a/src/job/entrypoint.sh b/src/job/entrypoint.sh
index 4116acb8a..f6835cd1a 100755
--- a/src/job/entrypoint.sh
+++ b/src/job/entrypoint.sh
@@ -4,6 +4,12 @@ mkdir -p /data/infrabox
 mkdir -p /data/tmp
 mkdir -p /data/repo
 mkdir -p ~/.ssh
+mkdir -p /root/.docker
+
+if [ -f /tmp/docker-secret/config.json ]; then
+    cp /tmp/docker-secret/config.json /root/.docker/config.json
+    echo "Docker config copied from secret"
+fi
 
 
 function startDocker() {