diff --git a/.github/workflows/test_chibios.yml b/.github/workflows/test_chibios.yml
index a1a36984bf..0b51e85e18 100644
--- a/.github/workflows/test_chibios.yml
+++ b/.github/workflows/test_chibios.yml
@@ -9,7 +9,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-${{ matrix.toolchain }}:latest
+    container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
diff --git a/.github/workflows/test_linux_sbc.yml b/.github/workflows/test_linux_sbc.yml
index 7af3534f2f..03d43085a5 100644
--- a/.github/workflows/test_linux_sbc.yml
+++ b/.github/workflows/test_linux_sbc.yml
@@ -8,7 +8,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-${{ matrix.toolchain }}:latest
+    container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
diff --git a/.github/workflows/test_replay.yml b/.github/workflows/test_replay.yml
index d855031023..e8567b324a 100644
--- a/.github/workflows/test_replay.yml
+++ b/.github/workflows/test_replay.yml
@@ -8,7 +8,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-${{ matrix.toolchain }}:latest
+    container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
diff --git a/.github/workflows/test_sitl_copter.yml b/.github/workflows/test_sitl_copter.yml
index 97c4519c4a..d7fc0ed109 100644
--- a/.github/workflows/test_sitl_copter.yml
+++ b/.github/workflows/test_sitl_copter.yml
@@ -8,7 +8,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-${{ matrix.toolchain }}:latest
+    container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
@@ -58,7 +58,7 @@ jobs:
   autotest:
     needs: build  # don't try to launch the tests matrix if it doesn't build first, profit from caching for fast build
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-base:latest
+    container: ardupilot/ardupilot-dev-base:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
@@ -124,7 +124,7 @@ jobs:
   build-gcc-heli:
     needs: build  # don't try to launch the tests matrix if it doesn't build first, profit from caching for fast build
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-base:latest
+    container: ardupilot/ardupilot-dev-base:latest
     steps:
       # git checkout the PR
       - uses: actions/checkout@v2
@@ -163,7 +163,7 @@ jobs:
   autotest-heli:
     needs: build-gcc-heli  # don't try to launch the tests matrix if it doesn't build first, profit from caching for fast build
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-base:latest
+    container: ardupilot/ardupilot-dev-base:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
diff --git a/.github/workflows/test_sitl_periph.yml b/.github/workflows/test_sitl_periph.yml
index f29e8e7d47..592dd35fd9 100644
--- a/.github/workflows/test_sitl_periph.yml
+++ b/.github/workflows/test_sitl_periph.yml
@@ -8,7 +8,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build-gcc-ap_periph:
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-base:latest
+    container: ardupilot/ardupilot-dev-base:latest
     steps:
       # git checkout the PR
       - uses: actions/checkout@v2
@@ -54,7 +54,7 @@ jobs:
     needs: build-gcc-ap_periph  # don't try to launch the tests matrix if it doesn't build first, profit from caching for fast build
     runs-on: ubuntu-20.04
     container: 
-      image: khancyr/ardupilot-dev-base:latest
+      image: ardupilot/ardupilot-dev-base:latest
       options: --privileged
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
diff --git a/.github/workflows/test_sitl_plane.yml b/.github/workflows/test_sitl_plane.yml
index c88054aeab..61a27f3d9a 100644
--- a/.github/workflows/test_sitl_plane.yml
+++ b/.github/workflows/test_sitl_plane.yml
@@ -8,7 +8,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-${{ matrix.toolchain }}:latest
+    container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
@@ -58,7 +58,7 @@ jobs:
   autotest:
     needs: build  # don't try to launch the tests matrix if it doesn't build first, profit from caching for fast build
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-base:latest
+    container: ardupilot/ardupilot-dev-base:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
diff --git a/.github/workflows/test_sitl_rover.yml b/.github/workflows/test_sitl_rover.yml
index 5cbac5098c..98a779fa18 100644
--- a/.github/workflows/test_sitl_rover.yml
+++ b/.github/workflows/test_sitl_rover.yml
@@ -8,7 +8,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-${{ matrix.toolchain }}:latest
+    container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
@@ -58,7 +58,7 @@ jobs:
   autotest:
     needs: build  # don't try to launch the tests matrix if it doesn't build first, profit from caching for fast build
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-base:latest
+    container: ardupilot/ardupilot-dev-base:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
diff --git a/.github/workflows/test_sitl_sub.yml b/.github/workflows/test_sitl_sub.yml
index a0a4372663..9e7e14cd23 100644
--- a/.github/workflows/test_sitl_sub.yml
+++ b/.github/workflows/test_sitl_sub.yml
@@ -8,7 +8,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-${{ matrix.toolchain }}:latest
+    container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
@@ -58,7 +58,7 @@ jobs:
   autotest:
     needs: build  # don't try to launch the tests matrix if it doesn't build first, profit from caching for fast build
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-base:latest
+    container: ardupilot/ardupilot-dev-base:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
diff --git a/.github/workflows/test_sitl_tracker.yml b/.github/workflows/test_sitl_tracker.yml
index 16800eda67..6f7c470e09 100644
--- a/.github/workflows/test_sitl_tracker.yml
+++ b/.github/workflows/test_sitl_tracker.yml
@@ -8,7 +8,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-${{ matrix.toolchain }}:latest
+    container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
@@ -58,7 +58,7 @@ jobs:
   autotest:
     needs: build  # don't try to launch the tests matrix if it doesn't build first, profit from caching for fast build
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-base:latest
+    container: ardupilot/ardupilot-dev-base:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix:
diff --git a/.github/workflows/test_unit_tests.yml b/.github/workflows/test_unit_tests.yml
index b0d3144585..386ade32a2 100644
--- a/.github/workflows/test_unit_tests.yml
+++ b/.github/workflows/test_unit_tests.yml
@@ -8,7 +8,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: khancyr/ardupilot-dev-${{ matrix.toolchain }}:latest
+    container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:latest
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
       matrix: