diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml
index 4d5fbec..21d28ca 100644
--- a/.gitea/workflows/publish.yaml
+++ b/.gitea/workflows/publish.yaml
@@ -38,30 +38,6 @@ jobs:
           username: ${{ secrets.REPO_USERNAME }}
           password: ${{ secrets.REPO_TOKEN }}
 
-      - name: Build and Push (Latest NodeJS)
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          context: ./gitea-runner
-          file: ./gitea-runner/NodeLatestDockerfile
-          tags: fascinated/docker-images:node-latest
-
-      - name: Build and Push (Latest NodeJS - pnpm)
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          context: ./gitea-runner
-          file: ./gitea-runner/NodeWithPnpmLatestDockerfile
-          tags: fascinated/docker-images:node-pnpm-latest
-
-      - name: Build and Push (Latest NodeJS - yarn)
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          context: ./gitea-runner
-          file: ./gitea-runner/NodeWithYarnLatestDockerfile
-          tags: fascinated/docker-images:node-yarn-latest
-
       - name: Build and Push (Java8 with Firefox)
         uses: docker/build-push-action@v4
         with:
@@ -69,3 +45,27 @@ jobs:
           context: ./java8-with-firefox
           file: ./java8-with-firefox/Dockerfile
           tags: fascinated/docker-images:node-yarn-latest
+
+      - name: Build and Push (Latest NodeJS)
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          context: ./gitea-runner
+          file: .NodeLatestDockerfile
+          tags: fascinated/docker-images:node-latest
+
+      - name: Build and Push (Latest NodeJS - pnpm)
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          context: ./gitea-runner
+          file: .NodeWithPnpmLatestDockerfile
+          tags: fascinated/docker-images:node-pnpm-latest
+
+      - name: Build and Push (Latest NodeJS - yarn)
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          context: ./gitea-runner
+          file: .NodeWithYarnLatestDockerfile
+          tags: fascinated/docker-images:node-yarn-latest
diff --git a/gitea-runner/NodeLatestDockerfile b/NodeLatestDockerfile
similarity index 100%
rename from gitea-runner/NodeLatestDockerfile
rename to NodeLatestDockerfile
diff --git a/gitea-runner/NodeWithPnpmLatestDockerfile b/NodeWithPnpmLatestDockerfile
similarity index 94%
rename from gitea-runner/NodeWithPnpmLatestDockerfile
rename to NodeWithPnpmLatestDockerfile
index 4cdd080..e1b7776 100644
--- a/gitea-runner/NodeWithPnpmLatestDockerfile
+++ b/NodeWithPnpmLatestDockerfile
@@ -1,6 +1,6 @@
-FROM fascinated/docker-images:node-latest
-
-# Install pnpm
-RUN npm install -g pnpm
-
-ENV PNPM_HOME=/usr/local/bin
+FROM fascinated/docker-images:node-latest
+
+# Install pnpm
+RUN npm install -g pnpm
+
+ENV PNPM_HOME=/usr/local/bin
diff --git a/gitea-runner/NodeWithYarnLatestDockerfile b/NodeWithYarnLatestDockerfile
similarity index 100%
rename from gitea-runner/NodeWithYarnLatestDockerfile
rename to NodeWithYarnLatestDockerfile
diff --git a/gitea-runner/java8-with-firefox/Dockerfile b/java8-with-firefox/Dockerfile
similarity index 100%
rename from gitea-runner/java8-with-firefox/Dockerfile
rename to java8-with-firefox/Dockerfile
diff --git a/gitea-runner/java8-with-firefox/entrtpoint.sh b/java8-with-firefox/entrtpoint.sh
similarity index 100%
rename from gitea-runner/java8-with-firefox/entrtpoint.sh
rename to java8-with-firefox/entrtpoint.sh