diff --git a/.github/workflows/build_deb_package.yml b/.github/workflows/build_deb_package.yml
index 04d43f7224..a16ef9538a 100644
--- a/.github/workflows/build_deb_package.yml
+++ b/.github/workflows/build_deb_package.yml
@@ -137,10 +137,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { image: sih,    target: sih,     arch: amd64, runner: x64,   platform: "linux/amd64", dockerfile: Dockerfile.sih }
-          - { image: sih,    target: sih,     arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.sih }
-          - { image: gazebo, target: default, arch: amd64, runner: x64,   platform: "linux/amd64", dockerfile: Dockerfile.gazebo }
-          - { image: gazebo, target: default, arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.gazebo }
+          - { image: sih,    repo: px4-sitl,        target: sih,     arch: amd64, runner: x64,   platform: "linux/amd64", dockerfile: Dockerfile.sih }
+          - { image: sih,    repo: px4-sitl,        target: sih,     arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.sih }
+          - { image: gazebo, repo: px4-sitl-gazebo, target: default, arch: amd64, runner: x64,   platform: "linux/amd64", dockerfile: Dockerfile.gazebo }
+          - { image: gazebo, repo: px4-sitl-gazebo, target: default, arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.gazebo }
     steps:
       - uses: runs-on/action@v2
       - uses: actions/checkout@v4
@@ -175,10 +175,10 @@ jobs:
           context: docker-context
           file: Tools/packaging/${{ matrix.dockerfile }}
           tags: |
-            px4io/px4-sitl-${{ matrix.image }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
-            px4io/px4-sitl-${{ matrix.image }}:latest-${{ matrix.arch }}
-            ghcr.io/px4/px4-sitl-${{ matrix.image }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
-            ghcr.io/px4/px4-sitl-${{ matrix.image }}:latest-${{ matrix.arch }}
+            px4io/${{ matrix.repo }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
+            px4io/${{ matrix.repo }}:latest-${{ matrix.arch }}
+            ghcr.io/px4/${{ matrix.repo }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
+            ghcr.io/px4/${{ matrix.repo }}:latest-${{ matrix.arch }}
           platforms: ${{ matrix.platform }}
           load: false
           push: ${{ needs.setup.outputs.should_push == 'true' }}
@@ -196,7 +196,9 @@ jobs:
     runs-on: [runs-on,"runner=1cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",extras=s3-cache,spot=false]
     strategy:
       matrix:
-        image: [sih, gazebo]
+        include:
+          - { image: sih,    repo: px4-sitl }
+          - { image: gazebo, repo: px4-sitl-gazebo }
     steps:
       - uses: runs-on/action@v2
 
@@ -210,7 +212,7 @@ jobs:
           VERSION="${{ needs.setup.outputs.px4_version }}"
 
           for REGISTRY in px4io ghcr.io/px4; do
-            IMAGE="${REGISTRY}/px4-sitl-${{ matrix.image }}"
+            IMAGE="${REGISTRY}/${{ matrix.repo }}"
 
             for TAG in ${VERSION} latest; do
               docker manifest create ${IMAGE}:${TAG} \
diff --git a/Tools/packaging/Dockerfile.sih b/Tools/packaging/Dockerfile.sih
index cfec72dd05..d09328f98b 100644
--- a/Tools/packaging/Dockerfile.sih
+++ b/Tools/packaging/Dockerfile.sih
@@ -4,13 +4,13 @@
 #
 # Build:
 #   make px4_sitl_sih && cd build/px4_sitl_sih && cpack -G DEB && cd ../..
-#   docker build -f Tools/packaging/Dockerfile.sih -t px4io/px4-sitl-sih:v1.17.0 build/px4_sitl_sih/
+#   docker build -f Tools/packaging/Dockerfile.sih -t px4io/px4-sitl:v1.17.0 build/px4_sitl_sih/
 #
 # Run (Linux):
-#   docker run --rm -it --network host px4io/px4-sitl-sih:v1.17.0
+#   docker run --rm -it --network host px4io/px4-sitl:v1.17.0
 #
 # Run (macOS / Windows):
-#   docker run --rm -it -p 14550:14550/udp -p 14540:14540/udp -p 19410:19410/udp -p 8888:8888/udp px4io/px4-sitl-sih:v1.17.0
+#   docker run --rm -it -p 14550:14550/udp -p 14540:14540/udp -p 19410:19410/udp -p 8888:8888/udp px4io/px4-sitl:v1.17.0
 
 FROM ubuntu:24.04 AS build
 COPY px4_*.deb /tmp/
diff --git a/Tools/packaging/test_sih_mission.py b/Tools/packaging/test_sih_mission.py
index 7ef70a1abe..deeee6df84 100644
--- a/Tools/packaging/test_sih_mission.py
+++ b/Tools/packaging/test_sih_mission.py
@@ -7,7 +7,7 @@ Validates that the SIH Docker container works end-to-end with MAVSDK.
 
 Prerequisites:
   - Docker container running:
-      docker run --rm --network host px4io/px4-sitl-sih:v1.17.0-alpha1
+      docker run --rm --network host px4io/px4-sitl:v1.17.0-alpha1
   - pip install mavsdk
   - mavsim-viewer running (optional):
       /path/to/mavsim-viewer -n 1