diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2e045a7bd4..e4780b06d3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -40,9 +40,14 @@ jobs:
             bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc fetch //... && break || sleep 20;
           done
       - name: Build All Images
-        run: bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc build $(bazel query 'kind(oci_image, deps(:sign_and_push))')
+        run: |
+          set -e
+          targets=$(bazel query 'kind(oci_image, deps(:sign_and_push))')
+          bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc build $targets
       - name: Unit Tests
         run: bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc test //... --build_tests_only
+      - name: Build Examples
+        run: bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc build //examples/...
 
   ci-images:
     name: CI image tests
diff --git a/examples/python3/BUILD b/examples/python3/BUILD
index aa08516b7c..3cf9c4a140 100644
--- a/examples/python3/BUILD
+++ b/examples/python3/BUILD
@@ -11,20 +11,29 @@ pkg_tar(
 )
 
 # This example runs a python program that walks the filesystem under "/etc" and prints every filename.
-[
-    oci_image(
-        name = "hello_" + distro,
-        base = "//experimental/python3:python3_root_arm64_" + distro,
-        cmd = [
-            "hello.py",
-            "/etc",
-        ],
-        tars = [
-            ":hello_py",
-        ],
-    )
-    for distro in DISTROS
-]
+oci_image(
+    name = "hello_debian11",
+    base = "//experimental/python3:python3_root_amd64_debian11",
+    cmd = [
+        "hello.py",
+        "/etc",
+    ],
+    tars = [
+        ":hello_py",
+    ],
+)
+
+oci_image(
+    name = "hello_debian12",
+    base = "//python3:python3_root_amd64_debian12",
+    cmd = [
+        "hello.py",
+        "/etc",
+    ],
+    tars = [
+        ":hello_py",
+    ],
+)
 
 # Run
 # podman load -i bazel-bin/examples/python3/tarball/tarball.tar