diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 4f0212a9..269b62a1 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -4,6 +4,10 @@ root /var/www/public
 fastcgi / php-fpm:9000 php {
     index index.php
 }
+
+# To handle .html extensions with laravel change ext to
+# ext / .html
+
 rewrite {
     r .*
     ext /
@@ -16,3 +20,9 @@ errors /var/log/caddy/error.log
 # Uncomment to enable TLS (HTTPS)
 # Change the first list to listen on port 443 when enabling TLS
 #tls self_signed
+
+# To use Lets encrpt tls with a DNS provider uncomment these
+# lines and change the provider as required
+#tls {
+#  dns cloudflare
+#}
diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index 9579d151..b6cfffd4 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.4
 
 MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
 
-ENV caddy_version=0.9.3
+ENV caddy_version=0.9.5
 
 LABEL caddy_version="$caddy_version" architecture="amd64"
 
@@ -12,13 +12,13 @@ RUN apk update \
 
 RUN curl --silent --show-error --fail --location \
         --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
-        "https://github.com/mholt/caddy/releases/download/v$caddy_version/caddy_linux_amd64.tar.gz" \
-        | tar --no-same-owner -C /usr/bin/ -xz caddy_linux_amd64 \
-    && mv /usr/bin/caddy_linux_amd64 /usr/bin/caddy \
+        "https://caddyserver.com/download/build?os=linux&arch=amd64&features=cloudflare%2Cdigitalocean%2Cdnsimple%2Cdyn%2Cgooglecloud%2Clinode%2Croute53" \
+        | tar --no-same-owner -C /usr/bin/ -xz caddy \
+    && mv /usr/bin/caddy /usr/bin/caddy \
     && chmod 0755 /usr/bin/caddy
 
 EXPOSE 80 443 2015
 
 WORKDIR /var/www/public
 
-CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile"]
+CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile"]
\ No newline at end of file