diff --git a/Dockerfile.prod b/Dockerfile.prod
index b7f5daa8..f6fb48de 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -42,8 +42,10 @@ CMD ["gunicorn", "felicity.main:felicity", "--bind", "0.0.0.0:8000", "--workers"
 FROM nginx:latest AS nginx-static
 RUN mkdir /app
 COPY --from=webapp-build /app/dist /app
-
+COPY ./services/nginx/static/default.conf.template /etc/nginx/templates/default.conf.template
+CMD ["nginx", "-g", "daemon off;"]
 
 FROM caddy:2-alpine AS caddy-static
 RUN mkdir /app
 COPY --from=webapp-build /app/dist /app
+COPY ./services/caddy/static/Caddyfile /etc/caddy/Caddyfile
diff --git a/docker-compose.other.yml b/docker-compose.other.yml
index 959bf0a9..483983b6 100644
--- a/docker-compose.other.yml
+++ b/docker-compose.other.yml
@@ -70,8 +70,6 @@ services:
       MINIO_SERVER: felicity-minio:9000
       MINIO_ACCESS: felicity
       MINIO_SECRET: felicity
-    volumes:
-      - ./felicity:/app/felicity
     ports:
       - 8000:8000
     networks:
@@ -94,7 +92,6 @@ services:
       - "80:80"
       - "443:443"
     volumes:
-      - ./services/caddy/static/Caddyfile:/etc/caddy/Caddyfile
       - ./caddy.data:/data
       - ./caddy.config:/config
     environment:
@@ -120,8 +117,6 @@ services:
       PROXY_BACKEND: felicity-api
       PROXY_PORT: 8000
       SERVER_HOST: ${SERVER_HOST}
-    volumes:
-      - ./services/nginx/static/:/etc/nginx/templates/
     depends_on:
       - felicity-api
     networks:
@@ -147,8 +142,6 @@ services:
       MINIO_SERVER: felicity-minio:9000
       MINIO_ACCESS: felicity
       MINIO_SECRET: felicity
-    volumes:
-      - ./felicity:/app/felicity
     ports:
       - 8000:8000
     networks:
@@ -252,5 +245,3 @@ services:
       READONLY_mg: 1
     networks:
       - felicitynet
-
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 81cc7f15..db66041a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,8 +24,6 @@ services:
       PROXY_BACKEND: felicity-api
       PROXY_PORT: 8000
       SERVER_HOST: ${SERVER_HOST}
-    volumes:
-      - ./services/nginx/static/:/etc/nginx/templates/
     depends_on:
       - felicity-api
     networks: