diff --git a/Cargo.toml b/Cargo.toml
index c4c2615c146bc..97deda04f75a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -514,7 +514,6 @@ ocp-logging = [
   "sources-kubernetes_logs",
   "sources-prometheus",
   "sources-internal_metrics",
-  "sources-demo_logs",
   "sources-http_server",
   "sources-syslog",
   "sources-opentelemetry",
@@ -533,10 +532,8 @@ ocp-logging = [
   "sinks-azure_logs_ingestion",
   "sinks-azure_monitor_logs",
   "sinks-elasticsearch",
-  "sinks-file",
   "sinks-kafka",
   "sinks-loki",
-  "sinks-console",
   "sinks-prometheus",
   "sinks-gcp",
   "sinks-splunk_hec",
@@ -549,6 +546,12 @@ ocp-logging = [
 
   "unix"
 ]
+ocp-logging-devel = [
+    "ocp-logging",
+    "sources-demo_logs",
+    "sinks-console",
+    "sinks-file"
+]
 
 # Default features for *-unknown-linux-gnu and *-apple-darwin
 default = ["enable-unix", "rdkafka?/gssapi-vendored"]
diff --git a/Dockerfile b/Dockerfile
index a2ad781b85b5a..3f96144ad84f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,6 @@ RUN INSTALL_PKGS=" \
       llvm \
       cyrus-sasl-devel \
       libtool \
-      crypto-policies-scripts \
       " && \
     dnf install -y $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
@@ -31,20 +30,29 @@ RUN mkdir -p /src
 WORKDIR /src
 COPY . /src
 RUN /src/scripts/environment/install-protoc.sh
-RUN make build
 
-FROM registry.access.redhat.com/ubi9/ubi-micro
+ARG FEATURES=ocp-logging
+RUN echo "FEATURES=${FEATURES}" && make build FEATURES=${FEATURES}
 
-RUN microdnf install -y \
+RUN mkdir -p /mnt/rootfs && \
+    dnf install -y --installroot /mnt/rootfs \
+      --releasever 9 \
+      --setopt install_weak_deps=false \
+      --nodocs \
       systemd \
       openssl-libs \
+      cyrus-sasl-lib \
       crypto-policies-scripts \
       ca-certificates && \
-    microdnf clean all
+    dnf --installroot /mnt/rootfs clean all
+
+RUN chroot /mnt/rootfs update-crypto-policies --set DEFAULT:PQ
+
+FROM registry.access.redhat.com/ubi9/ubi-micro
+
+COPY --from=builder /mnt/rootfs/ /
 
-# Copy PQ crypto-policies configuration from builder
-COPY --from=builder /etc/crypto-policies/ /etc/crypto-policies/
+COPY --from=builder /src/target/release/vector /usr/bin/vector
 
-COPY --from=builder /src/target/release/vector /usr/bin
 WORKDIR /usr/bin
 CMD ["/usr/bin/vector"]
diff --git a/Dockerfile.art b/Dockerfile.art
index 6b2fa7603132c..aaafed048faa0 100644
--- a/Dockerfile.art
+++ b/Dockerfile.art
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/ubi-minimal AS builder
+FROM registry.access.redhat.com/ubi9/ubi:latest AS builder
 
 RUN INSTALL_PKGS=" \
       gcc-c++ \
@@ -8,12 +8,12 @@ RUN INSTALL_PKGS=" \
       openssl-devel \
       llvm-toolset \
       rust-toolset-1.92.0 \
-      crypto-policies-scripts \
       " && \
-    microdnf install -y $INSTALL_PKGS && \
-    rpm -V $INSTALL_PKGS
+    dnf install -y $INSTALL_PKGS && \
+    rpm -V $INSTALL_PKGS && \
+    dnf clean all
 
-# Enable post-quantum cryptography
+# Enable post-quantum cryptography in builder environment
 RUN update-crypto-policies --set DEFAULT:PQ
 
 COPY . /opt/app-root/src
@@ -27,19 +27,25 @@ RUN make build-offline
 # See: https://github.com/openshift/enhancements/pull/2021
 RUN strip --strip-all /opt/app-root/src/target/release/vector
 
-RUN cp /opt/app-root/src/target/release/vector /usr/bin
-
-FROM registry.access.redhat.com/ubi9/ubi-micro
-
-COPY --from=builder /usr/bin/vector /usr/bin/
-RUN microdnf install -y \
+# Install ubi-micro runtime packages into a staging root directory using DNF
+RUN mkdir -p /mnt/rootfs && \
+    dnf install -y --installroot /mnt/rootfs \
+      --releasever 9 \
+      --setopt=install_weak_deps=false \
+      --nodocs \
       systemd \
       openssl-libs \
       crypto-policies-scripts \
-      ca-certificates
+      ca-certificates && \
+    dnf --installroot /mnt/rootfs clean all
+
+# Configure PQ crypto policy inside the staging root filesystem
+RUN chroot /mnt/rootfs update-crypto-policies --set DEFAULT:PQ
+
+FROM registry.access.redhat.com/ubi9/ubi-micro
 
-# Copy PQ crypto-policies configuration from builder
-COPY --from=builder /etc/crypto-policies/ /etc/crypto-policies/
+COPY --from=builder /mnt/rootfs/ /
+COPY --from=builder /opt/app-root/src/target/release/vector /usr/bin/vector
 
 WORKDIR /usr/bin
 CMD ["/usr/bin/vector"]