diff --git a/.github/workflows/build-nightly-cron.yaml b/.github/workflows/build-nightly-cron.yaml
index f63392a..3432e5f 100644
--- a/.github/workflows/build-nightly-cron.yaml
+++ b/.github/workflows/build-nightly-cron.yaml
@@ -342,20 +342,6 @@ jobs:
           username: ${{ secrets.ALIYUN_REGISTRY_USER }}
           password: ${{ secrets.ALIYUN_REGISTRY_TOKEN }}
 
-      - name: Build and Push
-        id: build-and-push
-        uses: docker/build-push-action@v6
-        with:
-          context: ./docker
-          file: ./docker/Dockerfile-nightly
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: |
-            ${{ steps.meta.outputs.labels }}
-            org.opencontainers.image.source=https://github.com/AirryCo/spt-server
-            org.opencontainers.image.url=https://github.com/AirryCo/spt-server
-            org.opencontainers.image.revision=${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID_WHOLE }}
-          platforms: linux/amd64,linux/arm64
       - name: Build and Push with Fika Server
         id: build-and-push-with-fika
         uses: docker/build-push-action@v6
@@ -370,6 +356,20 @@ jobs:
             org.opencontainers.image.url=https://github.com/AirryCo/spt-server
             org.opencontainers.image.revision=${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID_WHOLE }}
           platforms: linux/amd64,linux/arm64
+      - name: Build and Push
+        id: build-and-push
+        uses: docker/build-push-action@v6
+        with:
+          context: ./docker
+          file: ./docker/Dockerfile-nightly
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: |
+            ${{ steps.meta.outputs.labels }}
+            org.opencontainers.image.source=https://github.com/AirryCo/spt-server
+            org.opencontainers.image.url=https://github.com/AirryCo/spt-server
+            org.opencontainers.image.revision=${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID_WHOLE }}
+          platforms: linux/amd64,linux/arm64
 
   build-server-windows:
     needs: [prepare, build-server-linux]
diff --git a/docker/Dockerfile-nightly b/docker/Dockerfile-nightly
index 12f7b8e..40a3abe 100644
--- a/docker/Dockerfile-nightly
+++ b/docker/Dockerfile-nightly
@@ -1,4 +1,4 @@
-FROM node:20.11.1-bullseye AS server-builder
+FROM node:22.12.0-bullseye AS server-builder
 RUN apt update && apt install -y git git-lfs p7zip-full && \
     git clone -b 4.0.x-DEV --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \
     cd /snapshot && git lfs pull && \