diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 88afb8e35..b0787e461 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        target: [analyzer, api, legacy, playout, worker]
+        target: [analyzer, api, legacy, nginx, playout, worker]
 
     if: ${{ github.repository_owner == 'libretime' }}
     steps:
@@ -95,6 +95,7 @@ jobs:
             meta-analyzer/docker-metadata-action-bake.json
             meta-api/docker-metadata-action-bake.json
             meta-legacy/docker-metadata-action-bake.json
+            meta-nginx/docker-metadata-action-bake.json
             meta-playout/docker-metadata-action-bake.json
             meta-worker/docker-metadata-action-bake.json
           set: |
diff --git a/Dockerfile b/Dockerfile
index 2391bbe98..06de8159e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -278,3 +278,13 @@ USER ${UID}:${GID}
 
 ARG LIBRETIME_VERSION
 ENV LIBRETIME_VERSION=$LIBRETIME_VERSION
+
+#======================================================================================#
+# Nginx
+#======================================================================================#
+FROM nginx AS libretime-nginx
+
+COPY --from=libretime-legacy /var/www/html /var/www/html
+
+ARG LIBRETIME_VERSION
+ENV LIBRETIME_VERSION=$LIBRETIME_VERSION
diff --git a/docker-bake.json b/docker-bake.json
index 03d5ed6c5..95ca48838 100644
--- a/docker-bake.json
+++ b/docker-bake.json
@@ -1,7 +1,7 @@
 {
   "group": {
     "default": {
-      "targets": ["analyzer", "playout", "api", "worker", "legacy"]
+      "targets": ["analyzer", "playout", "api", "worker", "legacy", "nginx"]
     }
   },
   "target": {
@@ -19,6 +19,9 @@
     },
     "legacy": {
       "target": "libretime-legacy"
+    },
+    "nginx": {
+      "target": "libretime-nginx"
     }
   }
 }
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 334025bd8..ca89eadb2 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -67,6 +67,9 @@ services:
       - ./legacy:/var/www/html
 
   nginx:
+    build:
+      context: .
+      target: libretime-nginx
     volumes:
       - ./legacy:/var/www/html
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 18ea43bc6..ca2dc8caf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -95,17 +95,15 @@ services:
       - rabbitmq
     volumes:
       - ${LIBRETIME_CONFIG_FILEPATH:-./config.yml}:/etc/libretime/config.yml:ro
-      - libretime_assets:/var/www/html
       - libretime_storage:/srv/libretime
 
   nginx:
-    image: nginx
+    image: ghcr.io/libretime/libretime-nginx:${LIBRETIME_VERSION:-latest}
     ports:
       - 8080:8080
     depends_on:
       - legacy
     volumes:
-      - libretime_assets:/var/www/html:ro
       - libretime_storage:/srv/libretime:ro
       - ${NGINX_CONFIG_FILEPATH:-./nginx.conf}:/etc/nginx/conf.d/default.conf:ro
 
@@ -121,5 +119,4 @@ services:
 volumes:
   postgres_data: {}
   libretime_storage: {}
-  libretime_assets: {}
   libretime_playout: {}