diff --git a/.github/workflows/sync-ecr.yml b/.github/workflows/sync-ecr.yml
index e3b8f6e..b69dd86 100644
--- a/.github/workflows/sync-ecr.yml
+++ b/.github/workflows/sync-ecr.yml
@@ -155,14 +155,20 @@ jobs:
       - uses: actions/checkout@master
       - name: Define Matrix
         id: define-matrix
-        # Filter out the nodejs 22 and version from the matrix, as it is not supported on UBI.
+        # Filter out the nodejs 22 and 23 versions from the matrix, as they are not supported on UBI.
         # https://access.redhat.com/articles/3376841
-        # Filter out the python 3.10 version from the matrix, as it is not supported on UBI.
+        # Filter out the python 3.10 and 3.13 versions from the matrix, as they are not supported on UBI.
         # https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/installing_and_using_dynamic_programming_languages/assembly_introduction-to-python_installing-and-using-dynamic-programming-languages#con_python-versions_assembly_introduction-to-python
         run: |
-          echo matrix=$(python ./.github/scripts/matrix/gen-sync-matrix.py |
-            jq '.image |= map(select(. != "pulumi-python-3.10" and . != "pulumi-nodejs-22"))'
-          ) >> "$GITHUB_OUTPUT"
+          echo matrix=$(python ./.github/scripts/matrix/gen-matrix.py --no-arch |
+            jq '.include |= map(
+              select(
+                (.sdk != "nodejs" or .language_version != "22") and
+                (.sdk != "nodejs" or .language_version != "23") and
+                (.sdk != "python" or .language_version != "3.10") and
+                (.sdk != "python" or .language_version != "3.13")
+              )
+            )') >> "$GITHUB_OUTPUT"
 
   # NOTE: If UBI images become multi platform, this job can be replaced by adding a similar step to "-debian" for "-ubi" the previous job.
   ubi-images:
diff --git a/.github/workflows/sync-ghcr.yml b/.github/workflows/sync-ghcr.yml
index 0aca623..9a5967e 100644
--- a/.github/workflows/sync-ghcr.yml
+++ b/.github/workflows/sync-ghcr.yml
@@ -134,14 +134,20 @@ jobs:
       - uses: actions/checkout@master
       - name: Define Matrix
         id: define-matrix
-          # Filter out the nodejs 22 and version from the matrix, as it is not supported on UBI.
-          # https://access.redhat.com/articles/3376841
-          # Filter out the python 3.10 version from the matrix, as it is not supported on UBI.
-          # https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/installing_and_using_dynamic_programming_languages/assembly_introduction-to-python_installing-and-using-dynamic-programming-languages#con_python-versions_assembly_introduction-to-python
+        # Filter out the nodejs 22 and 23 versions from the matrix, as they are not supported on UBI.
+        # https://access.redhat.com/articles/3376841
+        # Filter out the python 3.10 and 3.13 versions from the matrix, as they are not supported on UBI.
+        # https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/installing_and_using_dynamic_programming_languages/assembly_introduction-to-python_installing-and-using-dynamic-programming-languages#con_python-versions_assembly_introduction-to-python
         run: |
-          echo matrix=$(python ./.github/scripts/matrix/gen-sync-matrix.py |
-            jq '.image |= map(select(. != "pulumi-python-3.10" and . != "pulumi-nodejs-22"))'
-          ) >> "$GITHUB_OUTPUT"
+          echo matrix=$(python ./.github/scripts/matrix/gen-matrix.py --no-arch |
+            jq '.include |= map(
+              select(
+                (.sdk != "nodejs" or .language_version != "22") and
+                (.sdk != "nodejs" or .language_version != "23") and
+                (.sdk != "python" or .language_version != "3.10") and
+                (.sdk != "python" or .language_version != "3.13")
+              )
+            )') >> "$GITHUB_OUTPUT"
 
   # NOTE: If UBI images become multi platform, this job can be replaced by adding a similar step to "-debian" for "-ubi" the previous job.
   ubi-images: