diff --git a/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl
index 942b46b0..699aa51f 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_97-cloudflare.sh.tmpl
@@ -257,6 +257,12 @@ if command -v cloudflared > /dev/null && [ -d "$HOME/.local/etc/cloudflared" ];
         logg warn '~/.cloudflared is already in the home directory - to ensure proper deployment, remove previous tunnel configuration folders'
     fi
 
+    ### Ensure /usr/local/etc/cloudflared exists
+    if [ -d /usr/local/etc/cloudflared ]; then
+        logg info 'Creating folder /usr/local/etc/cloudflared'
+        sudo mkdir -p /usr/local/etc/cloudflared
+    fi
+
     # Copy over configuration files
     logg info 'Copying over configuration files from ~/.local/etc/cloudflared to /usr/local/etc/cloudflared'
     sudo cp -f "$HOME/.local/etc/cloudflared/cert.pem" /usr/local/etc/cloudflared/cert.pem
@@ -303,8 +309,6 @@ if command -v cloudflared > /dev/null && [ -d "$HOME/.local/etc/cloudflared" ];
         sudo launchctl start com.cloudflare.cloudflared
     elif [ -f /etc/os-release ]; then
         # System is Linux
-        logg info 'Copying over configuration files from ~/.local/etc/cloudflared to /usr/local/etc/cloudflared'
-        sudo cp -rf "$HOME/.local/etc/cloudflared" /usr/local/etc/cloudflared
         if systemctl --all --type service | grep -q "cloudflared" > /dev/null; then
             logg info 'cloudflared service is already available as a service'
         else
diff --git a/home/dot_config/docker/config.json.tmpl b/home/dot_config/docker/config.json.tmpl
index 9d03007d..53a300b8 100644
--- a/home/dot_config/docker/config.json.tmpl
+++ b/home/dot_config/docker/config.json.tmpl
@@ -1,5 +1,7 @@
 {
-    "auths": {},
+    "auths": {
+        "https://index.docker.io/v1/": {}
+    },
     "credsStore": "{{ if (eq .host.distro.id "darwin") }}osxkeychain{{ else }}{{ if (eq .host.distro.id "windows") }}wincred{{ else }}secretservice{{ end }}{{ end }}",
     "currentContext": "default"
 }
\ No newline at end of file