diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml
new file mode 100644
index 0000000..66d0cf7
--- /dev/null
+++ b/.github/workflows/push-docker.yml
@@ -0,0 +1,23 @@
+name: Push Docker Images
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Login to Docker
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_REGISTRY_USER }}
+          password: ${{ secrets.DOCKER_REGISTRY_PASS }}
+      - name: Build and Push Images
+        run: |
+          docker buildx create --use
+          docker buildx build --platform=linux/amd64,linux/arm64 -t ikehunter5/jukebox-server:latest -f ./server/Dockerfile . --push
+          docker buildx build --platform=linux/amd64,linux/arm64 -t ikehunter5/jukebox-websocket:latest -f ./websocket/Dockerfile . --push
+          docker buildx build --platform=linux/amd64,linux/arm64 -t ikehunter5/jukebox-proxy:latest ./proxy --push
\ No newline at end of file
diff --git a/docker-compose.network.yml b/docker-compose.network.yml
index ba43609..c937bb7 100644
--- a/docker-compose.network.yml
+++ b/docker-compose.network.yml
@@ -2,8 +2,9 @@ services:
   server:
     restart: always
     build:
-      context: ./
-      dockerfile: ./server/Dockerfile
+      context: .
+      dockerfile: ./server.Dockerfile
+      # dockerfile: ./server/Dockerfile
     container_name: server-jbx
     environment:
       - NODE_ENV=network
diff --git a/proxy/Dockerfile b/proxy/Dockerfile
index 004f23a..5ab0115 100644
--- a/proxy/Dockerfile
+++ b/proxy/Dockerfile
@@ -15,7 +15,7 @@ RUN mkdir -p /vol/client && \
 
 USER nginx
 
-EXPOSE 80
+EXPOSE 8080
 VOLUME /vol/client
 
 CMD ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/server/Dockerfile b/server/Dockerfile
index 78021dc..182f011 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,4 +1,4 @@
-# Development Image
+# Server Image
 ################################################
 FROM node:20-bookworm