diff --git a/.gitea/workflows/java.yml b/.gitea/workflows/java.yml
index 9102085..195fcf5 100644
--- a/.gitea/workflows/java.yml
+++ b/.gitea/workflows/java.yml
@@ -45,12 +45,6 @@ jobs:
           username: ${{ secrets.REPO_USERNAME }}
           password: ${{ secrets.REPO_TOKEN }}
 
-      - uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-
       - uses: docker/build-push-action@v5
         with:
           context: ./generic
@@ -58,3 +52,11 @@ jobs:
           push: true
           tags: |
             fascinated/docker-images:java_${{ matrix.tag }}
+
+      - name: Build and Push (Java 8 - With Firefox)
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          context: ./java-8-with-firefox
+          file: ./java-8-with-firefox/Dockerfile
+          tags: fascinated/docker-images:java-8-with-firefox
diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml
index 334a75e..43f48af 100644
--- a/.gitea/workflows/publish.yaml
+++ b/.gitea/workflows/publish.yaml
@@ -38,22 +38,6 @@ jobs:
           username: ${{ secrets.REPO_USERNAME }}
           password: ${{ secrets.REPO_TOKEN }}
 
-      - name: Build and Push (Java 8)
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          context: ./generic/java/8
-          file: ./generic/java/8/Dockerfile
-          tags: fascinated/docker-images:java-8
-
-      - name: Build and Push (Java 8 - With Firefox)
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          context: ./java-8-with-firefox
-          file: ./java-8-with-firefox/Dockerfile
-          tags: fascinated/docker-images:java-8-with-firefox
-
       - name: Build and Push (Latest NodeJS)
         uses: docker/build-push-action@v4
         with: