diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 0e13b21a0c..b765fc8ad8 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+      image: ghcr.io/px4/px4-dev:v1.17.0-rc2
 
     strategy:
       fail-fast: false
@@ -50,7 +50,7 @@ jobs:
           PX4_SBOM_DISABLE: 1
         run: |
           cd "$GITHUB_WORKSPACE"
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --system --add safe.directory '*'
           make ${{ matrix.check }}
 
       - name: Uploading Coverage to Codecov.io
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index fc3c5a46ea..9c4b9db8ec 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -20,7 +20,7 @@ jobs:
     name: Clang-Tidy
     runs-on: [runs-on, runner=16cpu-linux-x64, "run-id=${{ github.run_id }}", "extras=s3-cache"]
     container:
-      image: px4io/px4-dev:v1.17.0-beta1
+      image: ghcr.io/px4/px4-dev:v1.17.0-rc2
     steps:
     - uses: runs-on/action@v2
     - uses: actions/checkout@v4
diff --git a/.github/workflows/docs-orchestrator.yml b/.github/workflows/docs-orchestrator.yml
index ad4ef6c260..39210dd300 100644
--- a/.github/workflows/docs-orchestrator.yml
+++ b/.github/workflows/docs-orchestrator.yml
@@ -70,7 +70,7 @@ jobs:
       contents: read
     runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
     container:
-      image: px4io/px4-dev:v1.17.0-beta1
+      image: ghcr.io/px4/px4-dev:v1.17.0-rc2
     steps:
       - uses: runs-on/action@v1
 
@@ -132,7 +132,7 @@ jobs:
       contents: write
     runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
     container:
-      image: px4io/px4-dev:v1.17.0-beta1
+      image: ghcr.io/px4/px4-dev:v1.17.0-rc2
     steps:
       - uses: runs-on/action@v1
 
diff --git a/.github/workflows/ekf_functional_change_indicator.yml b/.github/workflows/ekf_functional_change_indicator.yml
index 11c1970680..b426f7fafd 100644
--- a/.github/workflows/ekf_functional_change_indicator.yml
+++ b/.github/workflows/ekf_functional_change_indicator.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+      image: ghcr.io/px4/px4-dev:v1.17.0-rc2
 
     steps:
       - uses: actions/checkout@v4
@@ -27,7 +27,7 @@ jobs:
       - name: main test
         run: |
           cd "$GITHUB_WORKSPACE"
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --system --add safe.directory '*'
           make tests TESTFILTER=EKF
 
       - name: Check if there is a functional change
diff --git a/.github/workflows/ekf_update_change_indicator.yml b/.github/workflows/ekf_update_change_indicator.yml
index 6f6e1dde55..bfccf8f9de 100644
--- a/.github/workflows/ekf_update_change_indicator.yml
+++ b/.github/workflows/ekf_update_change_indicator.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+      image: ghcr.io/px4/px4-dev:v1.17.0-rc2
 
     env:
       GIT_COMMITTER_EMAIL: bot@px4.io
@@ -24,7 +24,7 @@ jobs:
       - name: main test
         run: |
           cd "$GITHUB_WORKSPACE"
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --system --add safe.directory '*'
           make tests TESTFILTER=EKF
 
       - name: Check if there exists diff and save result in variable
diff --git a/.github/workflows/failsafe_sim.yml b/.github/workflows/failsafe_sim.yml
index 24cdb49550..64a4908e25 100644
--- a/.github/workflows/failsafe_sim.yml
+++ b/.github/workflows/failsafe_sim.yml
@@ -29,7 +29,7 @@ jobs:
           "failsafe_web",
         ]
     container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+      image: ghcr.io/px4/px4-dev:v1.17.0-rc2
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
       - name: Install Node v20.18.0
diff --git a/.github/workflows/flash_analysis.yml b/.github/workflows/flash_analysis.yml
index 7f126352ab..cd7383ff69 100644
--- a/.github/workflows/flash_analysis.yml
+++ b/.github/workflows/flash_analysis.yml
@@ -26,7 +26,7 @@ jobs:
     name: Analyzing ${{ matrix.target }}
     runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+      image: ghcr.io/px4/px4-dev:v1.17.0-rc2
     strategy:
       matrix:
         target: [px4_fmu-v5x, px4_fmu-v6x]
diff --git a/.github/workflows/itcm_check.yml b/.github/workflows/itcm_check.yml
index 767f69aa7c..bdecc58406 100644
--- a/.github/workflows/itcm_check.yml
+++ b/.github/workflows/itcm_check.yml
@@ -24,7 +24,7 @@ jobs:
     name: Checking ${{ matrix.target }}
     runs-on: [runs-on,runner=4cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+      image: ghcr.io/px4/px4-dev:v1.17.0-rc2
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/nuttx_env_config.yml b/.github/workflows/nuttx_env_config.yml
index f05b456bb6..da472814f4 100644
--- a/.github/workflows/nuttx_env_config.yml
+++ b/.github/workflows/nuttx_env_config.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
+      image: ghcr.io/px4/px4-dev:v1.17.0-rc2
 
     strategy:
       matrix:
@@ -36,7 +36,7 @@ jobs:
       - name: Build PX4 and Run Test [${{ matrix.config }}]
         run: |
           cd "$GITHUB_WORKSPACE"
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --system --add safe.directory '*'
           export PX4_EXTRA_NUTTX_CONFIG='CONFIG_NSH_LOGIN_PASSWORD="test";CONFIG_NSH_CONSOLE_LOGIN=y'
           echo "PX4_EXTRA_NUTTX_CONFIG: $PX4_EXTRA_NUTTX_CONFIG"