diff --git a/.github/workflows/cpp-docker.yml b/.github/workflows/cpp-docker.yml
index b85692ec..3c88ba3f 100644
--- a/.github/workflows/cpp-docker.yml
+++ b/.github/workflows/cpp-docker.yml
@@ -17,10 +17,12 @@ jobs:
           dockerfile: Dockerfile.rpi
           arch: armv6l
           crosscompiler: https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%201%2C%20Zero/cross-gcc-10.2.0-pi_0-1.tar.gz          
+          image: balenalib/raspberry-pi
         - os: ubuntu-latest
           dockerfile: Dockerfile.rpi
           arch: armv7l
           crosscompiler: https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%202%2C%203/cross-gcc-10.2.0-pi_2-3.tar.gz                
+          image: balenalib/raspberry-pi2
         - os: ubuntu-latest
           dockerfile: Dockerfile
           arch: amd64
@@ -31,4 +33,4 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Build an image from Dockerfile
-      run: docker build -t docker.io/${{ github.repository }}:${{ matrix.arch }} -f ${{ matrix.dockerfile }} --build-arg CROSSCOMPILE=${{ matrix.crosscompiler }} --build-arg ARCH=${{ matrix.arch }} .
+      run: docker build -t docker.io/${{ github.repository }}:${{ matrix.arch }} -f ${{ matrix.dockerfile }} --build-arg CROSSCOMPILER=${{ matrix.crosscompiler }} --build-arg ARCH=${{ matrix.arch }} --build-arg IMAGE=${{ matrix.image }} .