diff --git a/.github/workflows/docker-build-pr.yml b/.github/workflows/docker-build-pr.yml
index be15b73d..1fb6f368 100644
--- a/.github/workflows/docker-build-pr.yml
+++ b/.github/workflows/docker-build-pr.yml
@@ -26,6 +26,9 @@ jobs:
           - service: caddy
             dockerfile: docker/caddy/Dockerfile
             context: .
+          - service: l4-port-manager
+            dockerfile: docker/l4-port-manager/Dockerfile
+            context: .
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/docker-build-trusted.yml b/.github/workflows/docker-build-trusted.yml
index 23b43fb1..a218c13f 100644
--- a/.github/workflows/docker-build-trusted.yml
+++ b/.github/workflows/docker-build-trusted.yml
@@ -29,6 +29,9 @@ jobs:
           - service: caddy
             dockerfile: docker/caddy/Dockerfile
             context: .
+          - service: l4-port-manager
+            dockerfile: docker/l4-port-manager/Dockerfile
+            context: .
 
     steps:
       - name: Checkout repository
diff --git a/docker-compose.yml b/docker-compose.yml
index 987c9ef8..cb06590c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -119,6 +119,7 @@ services:
   # Requires Docker socket access (read-only) to recreate the caddy container.
   l4-port-manager:
     container_name: caddy-proxy-manager-l4-ports
+    image: ghcr.io/fuomag9/caddy-proxy-manager-l4-port-manager:latest
     build:
       context: .
       dockerfile: docker/l4-port-manager/Dockerfile