diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index bfb921299..1fba37ce4 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -35,6 +35,10 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        IDF_VERSION: [v4.4.3, v5.0]
+
     steps:
       # The following steps are the standard boilerplate from
       # https://github.com/marketplace/actions/build-and-push-docker-images
@@ -55,8 +59,9 @@ jobs:
           context: tools/docker
           file: tools/docker/matter-builds
           push: true
-          tags: ${{ env.DOCKERHUB_REPO }}:${{ env.TAG_NAME }}
+          tags: ${{ env.DOCKERHUB_REPO }}:${{ env.TAG_NAME }}${{ matrix.IDF_VERSION != 'v4.4.3' && format('_idf{0}', matrix.IDF_VERSION) || ''}}
           platforms: ${{ env.BUILD_PLATFORMS }}
           build-args: |
             ESP_MATTER_CLONE_URL=${{ github.server_url }}/${{ github.repository }}.git
             IDF_CLONE_SHALLOW=1
+            IDF_CLONE_BRANCH_OR_TAG=${{ matrix.IDF_VERSION }}