diff --git a/docker/ours-rp-metrics.Dockerfile b/docker/ours-rp-metrics.Dockerfile
index e6202f8..97f3fc3 100644
--- a/docker/ours-rp-metrics.Dockerfile
+++ b/docker/ours-rp-metrics.Dockerfile
@@ -87,16 +87,6 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
 
 FROM --platform=$TARGETPLATFORM ${RUNTIME_IMAGE} AS runtime
 
-ARG SOURCE_COMMIT=unknown
-ARG SOURCE_DIRTY=unknown
-ARG BUILD_TIMESTAMP_UTC=unknown
-
-LABEL org.opencontainers.image.title="ours-rp-metrics" \
-      org.opencontainers.image.description="Ours RP artifact metrics image for multi-arch Docker Compose deployment" \
-      org.opencontainers.image.revision="${SOURCE_COMMIT}" \
-      org.opencontainers.image.created="${BUILD_TIMESTAMP_UTC}" \
-      org.opencontainers.image.source-dirty="${SOURCE_DIRTY}"
-
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
       ca-certificates \
@@ -107,6 +97,16 @@ WORKDIR /opt/ours-rp
 
 COPY --from=builder /build-out/bin/ /opt/ours-rp/bin/
 
+ARG SOURCE_COMMIT=unknown
+ARG SOURCE_DIRTY=unknown
+ARG BUILD_TIMESTAMP_UTC=unknown
+
+LABEL org.opencontainers.image.title="ours-rp-metrics" \
+      org.opencontainers.image.description="Ours RP artifact metrics image for multi-arch Docker Compose deployment" \
+      org.opencontainers.image.revision="${SOURCE_COMMIT}" \
+      org.opencontainers.image.created="${BUILD_TIMESTAMP_UTC}" \
+      org.opencontainers.image.source-dirty="${SOURCE_DIRTY}"
+
 RUN chmod +x /opt/ours-rp/bin/* \
     && mkdir -p /var/lib/ours-rp/state /var/lib/ours-rp/runs /var/lib/ours-rp/logs
 
diff --git a/docker/ours-rp-runtime.Dockerfile b/docker/ours-rp-runtime.Dockerfile
index 3c0e8d0..9e30e8e 100644
--- a/docker/ours-rp-runtime.Dockerfile
+++ b/docker/ours-rp-runtime.Dockerfile
@@ -94,16 +94,6 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
 
 FROM --platform=$TARGETPLATFORM ${RUNTIME_IMAGE} AS runtime
 
-ARG SOURCE_COMMIT=unknown
-ARG SOURCE_DIRTY=unknown
-ARG BUILD_TIMESTAMP_UTC=unknown
-
-LABEL org.opencontainers.image.title="ours-rp-runtime" \
-      org.opencontainers.image.description="Ours RP runtime image for multi-arch Docker Compose deployment" \
-      org.opencontainers.image.revision="${SOURCE_COMMIT}" \
-      org.opencontainers.image.created="${BUILD_TIMESTAMP_UTC}" \
-      org.opencontainers.image.source-dirty="${SOURCE_DIRTY}"
-
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
       bash \
@@ -130,6 +120,16 @@ COPY tests/fixtures/ta/ /opt/ours-rp/fixtures/ta/
 COPY fixtures/live_20260619/tal/ /opt/ours-rp/fixtures/live_20260619/tal/
 COPY fixtures/live_20260619/ta/ /opt/ours-rp/fixtures/live_20260619/ta/
 
+ARG SOURCE_COMMIT=unknown
+ARG SOURCE_DIRTY=unknown
+ARG BUILD_TIMESTAMP_UTC=unknown
+
+LABEL org.opencontainers.image.title="ours-rp-runtime" \
+      org.opencontainers.image.description="Ours RP runtime image for multi-arch Docker Compose deployment" \
+      org.opencontainers.image.revision="${SOURCE_COMMIT}" \
+      org.opencontainers.image.created="${BUILD_TIMESTAMP_UTC}" \
+      org.opencontainers.image.source-dirty="${SOURCE_DIRTY}"
+
 RUN chmod +x /opt/ours-rp/run_soak.sh /opt/ours-rp/bin/* \
     && mkdir -p /var/lib/ours-rp/state /var/lib/ours-rp/runs /var/lib/ours-rp/logs /var/lib/ours-rp/tmp
 
diff --git a/scripts/docker/build_docker_installer_package.sh b/scripts/docker/build_docker_installer_package.sh
index e124808..d55d2e1 100755
--- a/scripts/docker/build_docker_installer_package.sh
+++ b/scripts/docker/build_docker_installer_package.sh
@@ -384,6 +384,7 @@ image_tag=$IMAGE_TAG
 image_tar=$(basename "$IMAGE_TAR")
 image_tar_size_bytes=$(wc -c < "$IMAGE_TAR")
 image_tar_sha256=$runtime_tar_sha256
+runtime_image=$IMAGE_TAG
 runtime_image_revision=$runtime_image_revision
 runtime_image_dirty=$runtime_image_dirty
 rpki_image=$IMAGE_TAG