diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index cf937ab..a02fe58 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -46,6 +46,9 @@ jobs:
       - name: Start docker-compose of project
         run: docker compose --env-file .env -f docker/docker-compose.yaml up -d
 
+      - name: Build image caddy
+        run: docker build -t caddy:wedding -f docker/caddy/dockerfile .
+
       - name: Start docker-compose caddy
         run: docker compose -f docker/caddy/caddy.yaml up -d
   
\ No newline at end of file
diff --git a/docker/caddy/caddy.yaml b/docker/caddy/caddy.yaml
index a166b88..a959951 100644
--- a/docker/caddy/caddy.yaml
+++ b/docker/caddy/caddy.yaml
@@ -1,6 +1,6 @@
 services:
   caddy:
-    image: caddy:latest
+    image: caddy:wedding
     restart: unless-stopped
     cap_add:
       - NET_ADMIN
@@ -8,17 +8,19 @@ services:
       - "80:80"
       - "443:443"
       - "443:443/udp"
-    # volumes:
-    #   - ./conf:/etc/caddy
-    #   - ./../../server/frontend:/srv
-    #   - caddy_data:/data
-    #   - caddy_config:/config
+    volumes:
+      - caddy_data/conf:/etc/caddy
+      - caddy_site/../../server/frontend:/srv
+      - caddy_data:/data
+      - caddy_config:/config
     networks:
       - docker_wedding-site-network 
 
 volumes:
   caddy_data:
   caddy_config:
+  caddy_site:
+  caddy_caddyfile:
 networks:
   docker_wedding-site-network :
     external: true
\ No newline at end of file
diff --git a/docker/caddy/dockerfile b/docker/caddy/dockerfile
new file mode 100644
index 0000000..5c55aa6
--- /dev/null
+++ b/docker/caddy/dockerfile
@@ -0,0 +1,3 @@
+FROM caddy:latest
+COPY conf/Caddyfile /etc/caddy/Caddyfile
+COPY ./../../server/frontend /srv
\ No newline at end of file