diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 01638869f..a127ba920 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -32,13 +32,10 @@ jobs:
             ROS_DISTRO=${{ matrix.ros_distribution }}
           tags: ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}
           context: .github/minimal-rmf
-  build-docker-images:
+  build-dashboard-image:
     needs: build-minimal-rmf-docker-images
-    name: Push Docker images to GitHub Packages
+    name: Push Dashboard docker image to GitHub Packages
     runs-on: ubuntu-24.04
-    strategy:
-      matrix:
-        ros_distribution: [jazzy, rolling]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Docker Buildx
@@ -52,15 +49,32 @@ jobs:
       - name: Build and push dashboard
         uses: docker/build-push-action@v5
         with:
-          push: false
+          push: true
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}
-          tags: ghcr.io/${{ github.repository }}/dashboard:${{ matrix.ros_distribution }}
+            BASE_IMAGE=ghcr.io/${{ github.repository }}/minimal-rmf:rolling
+          tags: ghcr.io/${{ github.repository }}/dashboard:latest
           context: .github/dashboard
+  build-api-server-image:
+    needs: build-minimal-rmf-docker-images
+    name: Push API server docker image to GitHub Packages
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        ros_distribution: [jazzy, rolling]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to docker
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push api-server
         uses: docker/build-push-action@v5
         with:
-          push: false
+          push: true
           build-args: |
             ROS_DISTRO=${{ matrix.ros_distribution }}
             BASE_IMAGE=ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}