diff --git a/caddy/config/caddyfile/check_caddyfile.sh b/caddy/config/caddyfile/check_caddyfile.sh
index 8ec6d2f..601a573 100755
--- a/caddy/config/caddyfile/check_caddyfile.sh
+++ b/caddy/config/caddyfile/check_caddyfile.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 set -euo pipefail
 
-SCRIPT_PATH="$(readlink -f "${BASH_SOURCE[0]}")"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-docker run --rm caddy -v "${SCRIPT_PATH}/Caddyfile:/etc/caddy/Caddyfile" caddy validate --config /etc/caddy/Caddyfile
+docker run --rm -v "${SCRIPT_DIR}/Caddyfile:/etc/caddy/Caddyfile" caddy caddy fmt --overwrite /etc/caddy/Caddyfile
+docker run --rm -v "${SCRIPT_DIR}/Caddyfile:/etc/caddy/Caddyfile" caddy caddy validate --config /etc/caddy/Caddyfile
 
diff --git a/caddy/config/caddyfile/rewrite_caddyfile.sh b/caddy/config/caddyfile/rewrite_caddyfile.sh
deleted file mode 100755
index 2b6273a..0000000
--- a/caddy/config/caddyfile/rewrite_caddyfile.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-docker run --rm caddy caddy validate --config /etc/caddy/Caddyfile
-