diff --git a/caddy.Dockerfile b/caddy.Dockerfile
new file mode 100644
index 0000000..4e70a86
--- /dev/null
+++ b/caddy.Dockerfile
@@ -0,0 +1,6 @@
+FROM caddy:2.8.4-alpine
+
+RUN apk update && \
+    apk add nss-tools
+
+COPY ./Caddyfile /etc/caddy
diff --git a/promtail.Dockerfile b/promtail.Dockerfile
new file mode 100644
index 0000000..1df6b42
--- /dev/null
+++ b/promtail.Dockerfile
@@ -0,0 +1,3 @@
+FROM grafana/promtail:main-a08ee68
+
+COPY ./promtail.yml /etc/promtail/config.yml
diff --git a/service.yml b/service.yml
index 5dbacff..28d9975 100644
--- a/service.yml
+++ b/service.yml
@@ -22,7 +22,7 @@ volumes:
   - name: caddy-logs
 containers:
   - name: caddy
-    image: caddy:2.8.4-alpine
+    image: sesame-caddy:latest
     env-file: /etc/opt/spadinastan/sesame.env
     volumes:
       - name: caddy-data
@@ -31,15 +31,9 @@ containers:
         container: /config
       - name: caddy-logs
         container: /var/log/caddy
-      - host: ./Caddyfile
-        container: /etc/caddy/Caddyfile
-        readonly: true
   - name: promtail
-    image: grafana/promtail:main-a08ee68 # Updated: 11/6/2024
+    image: sesame-promtail:latest # Updated: 11/6/2024
     volumes:
       - name: caddy-logs
         container: /var/caddy-logs
         readonly: true
-      - host: ./promtail.yml
-        container: /etc/promtail/config.yml
-        readonly: true