diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index ef39203..4f7542f 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -34,7 +34,15 @@ jobs:
           cache-to: type=gha,mode=max
           no-cache: false
           outputs: type=docker,dest=/tmp/moveit2.tar
-      - name: Build nav2 image
+      - name: Build space robots demo image
+        run: |
+          docker load --input /tmp/moveit2.tar
+          docker images
+          cd space_robots && ./build.sh
+  space_nav2:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Build space_nav2 image
         uses: docker/build-push-action@v2
         with:
           context: navigation2
@@ -43,8 +51,3 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           no-cache: false
-      - name: Build space robots demo image
-        run: |
-          docker load --input /tmp/moveit2.tar
-          docker images
-          cd space_robots && ./build.sh