diff --git a/.github/workflows/build-cfs-rtems4.11.yml b/.github/workflows/build-cfs-rtems4.11.yml
index 87e9946b8..9194331f4 100644
--- a/.github/workflows/build-cfs-rtems4.11.yml
+++ b/.github/workflows/build-cfs-rtems4.11.yml
@@ -31,7 +31,7 @@ jobs:
     if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }}
     name: Build
     runs-on: ubuntu-18.04
-    container: nmullane/qemu_rtems:4.11
+    container: ghcr.io/core-flight-system/qemu-rtems-4-11:latest
 
     strategy:
       fail-fast: false
@@ -67,7 +67,7 @@ jobs:
   test-cfs:
     name: Test
     runs-on: ubuntu-18.04
-    container: nmullane/qemu_rtems:4.11
+    container: ghcr.io/core-flight-system/qemu-rtems-4-11:latest
 
     needs: build-cfs
 
@@ -85,7 +85,6 @@ jobs:
       # Disable mcopy check otherwise disk image build fails
       MTOOLS_SKIP_CHECK: 1
 
-
     steps:
       # Checks out a copy of your repository on the ubuntu-latest machine
       - name: Checkout code
diff --git a/.github/workflows/build-cfs-rtems5.yml b/.github/workflows/build-cfs-rtems5.yml
index 155366f55..807ee5733 100644
--- a/.github/workflows/build-cfs-rtems5.yml
+++ b/.github/workflows/build-cfs-rtems5.yml
@@ -31,7 +31,7 @@ jobs:
     if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }}
     name: Build
     runs-on: ubuntu-18.04
-    container: nmullane/qemu_rtems:5
+    container: ghcr.io/core-flight-system/qemu-rtems-5:latest
 
     strategy:
       fail-fast: false
@@ -67,7 +67,7 @@ jobs:
   test-cfs:
     name: Test
     runs-on: ubuntu-18.04
-    container: nmullane/qemu_rtems:5
+    container: ghcr.io/core-flight-system/qemu-rtems-5:latest
 
     needs: build-cfs
 
@@ -85,7 +85,6 @@ jobs:
       # Disable mcopy check otherwise disk image build fails
       MTOOLS_SKIP_CHECK: 1
 
-
     steps:
       # Checks out a copy of your repository on the ubuntu-latest machine
       - name: Checkout code
@@ -124,4 +123,4 @@ jobs:
         if: always()
         with:
           name: cFS-rtems-log-summary-${{ matrix.buildtype }}
-          path: ./build/exe/cpu1/*.log
+          path: ./build/exe/cpu1/*.log
\ No newline at end of file