diff --git a/Dockerfile b/Dockerfile
index 7d7eecd..0d945fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
 FROM klakegg/hugo:alpine-onbuild AS hugo
 
-FROM nginx:alpine
-COPY --from=hugo /onbuild /usr/share/nginx/html
+FROM caddy:2-alpine
+
+ADD src/  /usr/share/caddy/
diff --git a/drone.yaml b/drone.yaml
index 82e1f3f..8666bf3 100644
--- a/drone.yaml
+++ b/drone.yaml
@@ -8,8 +8,13 @@ trigger:
     - tag
 
 steps:
-  - name: build-hugo-website
-    image: hugomods/hugo:latest
+  - name: build-hugo
+    image: ariejan/drone-hugo
+    settings:
+      hugo_version: 0.65.3
+
+  - name: build-docker-caddy
+    image: plugins/docker
     settings:
       registry: h3m6q87t.gra7.container-registry.ovh.net
       username:
@@ -18,7 +23,7 @@ steps:
         from_secret: docker_password
       dockerfile: ./Dockerfile
       context: ./
-      repo: h3m6q87t.gra7.container-registry.ovh.net/chill-website
+      repo: h3m6q87t.gra7.container-registry.ovh.net/chill_website
       tag: ${DRONE_TAG:=latest}
       pull_image: true