diff --git a/.github/actions/ci-container/action.yaml b/.github/actions/ci-container/action.yaml
new file mode 100644
index 00000000000..5bdbc4384c5
--- /dev/null
+++ b/.github/actions/ci-container/action.yaml
@@ -0,0 +1,7 @@
+name: ci-container
+runs:
+  using: 'docker'
+  image: 'docker.pkg.github.com/apache/incubator-nuttx-testing/nuttx-ci-linux'
+  args:
+    - "-c"
+    - ${{ inputs.run }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 44165c63591..3935bab4c10 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,6 @@ on:
 jobs:
   check:
     runs-on: ubuntu-18.04
-    container: liuguo09/ubuntu-nuttx:18.04
 
     steps:
     - name: Checkout nuttx repo
@@ -60,12 +59,12 @@ jobs:
 
   build:
     runs-on: ubuntu-18.04
-    container: liuguo09/ubuntu-nuttx:18.04
+    env:
+      DOCKER_BUILDKIT: 1
 
     strategy:
       matrix:
-        boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, arm-14, arm-15, mips-riscv-x86, sim]
-
+        boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, arm-14, arm-15, mips-riscv-x86, sim, xtensa]
     steps:
     - name: Checkout nuttx repo
       uses: actions/checkout@v2
@@ -91,7 +90,21 @@ jobs:
         repository: apache/incubator-nuttx-testing
         path: testing
 
+    - name: Docker Login
+      uses: azure/docker-login@v1
+      with:
+        login-server: docker.pkg.github.com
+        username: ${GITHUB_ACTOR}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Run Pull Container
+      uses: ./nuttx/.github/actions/ci-container
+
     - name: Run builds
-      run: |
-        cd testing
-        ./cibuild.sh -x testlist/${{matrix.boards}}.dat
+      uses: ./nuttx/.github/actions/ci-container
+      env:
+        BLOBDIR: /tools/blobs
+      with:
+        run: |
+          cd testing
+          ./cibuild.sh -x testlist/${{matrix.boards}}.dat