diff --git a/.github/actions/ci-container/action.yaml b/.github/actions/ci-container/action.yaml
index d87f1a1ec5..d4fcefa9b8 100644
--- a/.github/actions/ci-container/action.yaml
+++ b/.github/actions/ci-container/action.yaml
@@ -18,7 +18,7 @@ inputs:
     required: true
 runs:
   using: 'docker'
-  image: 'docker.pkg.github.com/apache/incubator-nuttx/apache-nuttx-ci-linux'
+  image: 'ghcr.io/apache/incubator-nuttx/apache-nuttx-ci-linux'
   args:
     - "/bin/bash"
     - "-ce"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 122d1dc8c4..81da491b32 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -127,12 +127,12 @@ jobs:
       - name: Docker Login
         uses: azure/docker-login@v1
         with:
-          login-server: docker.pkg.github.com
+          login-server: ghcr.io
           username: ${GITHUB_ACTOR}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker Pull
-        run: docker pull docker.pkg.github.com/apache/incubator-nuttx/apache-nuttx-ci-linux
+        run: docker pull ghcr.io/apache/incubator-nuttx/apache-nuttx-ci-linux
       - name: Export NuttX Repo SHA
         run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
       - name: Run builds
diff --git a/.github/workflows/docker_linux.yml b/.github/workflows/docker_linux.yml
index 4db41fca55..4b272b275a 100644
--- a/.github/workflows/docker_linux.yml
+++ b/.github/workflows/docker_linux.yml
@@ -36,12 +36,12 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_BUILDKIT: 1
-      IMAGE_TAG: docker.pkg.github.com/${{ github.repository }}/apache-nuttx-ci-linux
+      IMAGE_TAG: ghcr.io/${{ github.repository }}/apache-nuttx-ci-linux
     steps:
       - uses: actions/checkout@v2
 
       - name: Log into registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Build Linux image
         run: |