diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index a565269..785f2e0 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -23,17 +23,18 @@ jobs:
           name: osu-server
           path: grpc-backend
 
-      - name: Build Frontend Docker image
-        run: |
-          docker build -t juli0n21/frontend-container:latest -t juli0n21/frontend-container:${{ github.sha }} ./frontend
+      - name: Login to Private Registry
+        uses: docker/login-action@v3
+        with:
+          registry: docker.illegalesachen.download
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Log in to Docker Hub
-        env:
-          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-          DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
-        run: echo "${DOCKER_HUB_TOKEN}" | docker login -u "${DOCKER_HUB_USERNAME}" --password-stdin
-
-      - name: Push Frontend Docker image
-        run: |
-          docker push juli0n21/frontend-container:${{ github.sha }}
-          docker push juli0n21/frontend-container:latest
+      - name: Build and Push
+        uses: docker/build-push-action@v6
+        with:
+          context: ./frontend
+          push: true
+          tags: |
+            docker.illegalesachen.download/osu/music/frontend:latest
+            docker.illegalesachen.download/osu/music/frontend:${{ github.sha }}
\ No newline at end of file
diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
index 0cbccfa..105246f 100644
--- a/.github/workflows/proxy.yml
+++ b/.github/workflows/proxy.yml
@@ -23,17 +23,18 @@ jobs:
           name: osu-server
           path: grpc-backend
 
-      - name: Build Proxy Docker image
-        run: |
-          docker build -t juli0n21/proxy-container:latest -t juli0n21/proxy-container:${{ github.sha }} ./proxy
+      - name: Login to Private Registry
+        uses: docker/login-action@v3
+        with:
+          registry: docker.illegalesachen.download
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Log in to Docker Hub
-        env:
-          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-          DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
-        run: echo "${DOCKER_HUB_TOKEN}" | docker login -u "${DOCKER_HUB_USERNAME}" --password-stdin
-
-      - name: Push Proxy Docker image
-        run: |
-          docker push juli0n21/proxy-container:${{ github.sha }}
-          docker push juli0n21/proxy-container:latest
+      - name: Build and Push
+        uses: docker/build-push-action@v6
+        with:
+          context: ./proxy
+          push: true
+          tags: |
+            docker.illegalesachen.download/osu/music/proxy:latest
+            docker.illegalesachen.download/osu/music/proxy:${{ github.sha }}