diff --git a/Dockerfile b/Dockerfile
index ce5170955..ab42f7372 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -165,6 +165,7 @@ RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp
 FROM base as base-penultimate
 ARG variant
 ARG bootloader
+ARG SKIP_CONFIGS
 # Switch to a signed systemd-boot, if configured
 RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp \
     --mount=type=bind,from=packaging,src=/,target=/run/packaging \
@@ -183,7 +184,7 @@ RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp
 RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp \
     --mount=type=bind,from=packaging,src=/,target=/run/packaging \
     --mount=type=bind,from=packages,src=/,target=/run/packages \
-    /run/packaging/install-rpm-and-setup /run/packages
+    SKIP_CONFIGS="${SKIP_CONFIGS}" /run/packaging/install-rpm-and-setup /run/packages
 # Inject some other configuration
 COPY --from=packaging /usr-extras/ /usr/
 # Clean up package manager caches
diff --git a/contrib/packaging/install-rpm-and-setup b/contrib/packaging/install-rpm-and-setup
index ad91188f4..2d738650e 100755
--- a/contrib/packaging/install-rpm-and-setup
+++ b/contrib/packaging/install-rpm-and-setup
@@ -24,12 +24,16 @@ touch /usr/lib/.bootc-dev-stamp
 # Fedora 43+ ships a GRUB with the BLI module, so enable DPS
 # auto-discovery for root.  This must run after our RPM is installed
 # since older bootc doesn't recognize the discoverable-partitions key.
-. /usr/lib/os-release
-if [ "${ID}" = "fedora" ] && [ "${VERSION_ID}" -ge 43 ] 2>/dev/null; then
-  cat > /usr/lib/bootc/install/20-discoverable-partitions.toml <<'EOF'
+# Skip this when SKIP_CONFIGS is set (e.g. for CoreOS testing, where the
+# target system uses its own partitioning scheme without DPS type GUIDs).
+if [ -z "${SKIP_CONFIGS:-}" ]; then
+  . /usr/lib/os-release
+  if [ "${ID}" = "fedora" ] && [ "${VERSION_ID}" -ge 43 ] 2>/dev/null; then
+    cat > /usr/lib/bootc/install/20-discoverable-partitions.toml <<'EOF'
 [install]
 discoverable-partitions = true
 EOF
+  fi
 fi
 
 # Workaround for https://github.com/bootc-dev/bootc/issues/1546