diff --git a/.github/minimal-rmf/Dockerfile b/.github/minimal-rmf/Dockerfile
index cd3a47a98..7b2e85ca2 100644
--- a/.github/minimal-rmf/Dockerfile
+++ b/.github/minimal-rmf/Dockerfile
@@ -1,7 +1,7 @@
-ARG BASE_IMAGE=docker.io/ros:jazzy-ros-base
+ARG ROS_DISTRO=jazzy
+ARG BASE_IMAGE=docker.io/ros:$ROS_DISTRO-ros-base
 FROM $BASE_IMAGE
 ARG BRANCH=main
-ARG ROS_DISTRO=jazzy
 
 ### build minimal rmf
 
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ef2d1e2d3..4547ada67 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,8 +1,9 @@
 name: Nightly
-on:
-  schedule:
-    # 2am SGT
-    - cron: '0 18 * * *'
+# on:
+#   schedule:
+#     # 2am SGT
+#     - cron: '0 18 * * *'
+on: push
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -32,57 +33,57 @@ jobs:
             ROS_DISTRO=${{ matrix.ros_distribution }}
           tags: ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}-nightly
           context: .github/minimal-rmf
-  build-dashboard-image:
-    needs: build-minimal-rmf-docker-images
-    name: Push Dashboard docker image to GitHub Packages
-    runs-on: ubuntu-24.04
-    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 demo-dashboard
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository }}/minimal-rmf:rolling
-          tags: ghcr.io/${{ github.repository }}/demo-dashboard:latest
-          context: .github/demo-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:
-      fail-fast: false
-      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: true
-          build-args: |
-            ROS_DISTRO=${{ matrix.ros_distribution }}
-            BASE_IMAGE=ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}-nightly
-          tags: |
-            ghcr.io/${{ github.repository }}/api-server:${{ matrix.ros_distribution }}-nightly
-            ${{ matrix.ros_distribution == 'jazzy' && format('ghcr.io/{0}/api-server:latest', github.repository) || null}}
-          context: .github/api-server
+  # build-dashboard-image:
+  #   needs: build-minimal-rmf-docker-images
+  #   name: Push Dashboard docker image to GitHub Packages
+  #   runs-on: ubuntu-24.04
+  #   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 demo-dashboard
+  #       uses: docker/build-push-action@v5
+  #       with:
+  #         push: true
+  #         build-args: |
+  #           BASE_IMAGE=ghcr.io/${{ github.repository }}/minimal-rmf:rolling
+  #         tags: ghcr.io/${{ github.repository }}/demo-dashboard:latest
+  #         context: .github/demo-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:
+  #     fail-fast: false
+  #     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: true
+  #         build-args: |
+  #           ROS_DISTRO=${{ matrix.ros_distribution }}
+  #           BASE_IMAGE=ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}-nightly
+  #         tags: |
+  #           ghcr.io/${{ github.repository }}/api-server:${{ matrix.ros_distribution }}-nightly
+  #           ${{ matrix.ros_distribution == 'jazzy' && format('ghcr.io/{0}/api-server:latest', github.repository) || null}}
+  #         context: .github/api-server
   # dashboard-e2e:
   #   strategy:
   #     matrix: