diff --git a/04_setup_ironic.sh b/04_setup_ironic.sh
index 2e7f17b2f..e0e9aa282 100755
--- a/04_setup_ironic.sh
+++ b/04_setup_ironic.sh
@@ -65,11 +65,14 @@ if [ ! -z "${MIRROR_IMAGES}" ]; then
     _tmpfiles="$_tmpfiles $EXTRACT_DIR"
     MIRROR_LOG_FILE=/tmp/tmp_image_mirror-${OPENSHIFT_RELEASE_TAG}.log
 
+    mkdir -p "$OCP_DIR/release-image-signature"
+
     oc adm release mirror \
        --insecure=true \
         -a ${COMBINED_AUTH_FILE}  \
         --from ${OPENSHIFT_RELEASE_IMAGE} \
         --to-release-image ${LOCAL_REGISTRY_DNS_NAME}:${LOCAL_REGISTRY_PORT}/localimages/local-release-image:${OPENSHIFT_RELEASE_TAG} \
+        --release-image-signature-to-dir "$OCP_DIR/release-image-signature" \
         --to ${LOCAL_REGISTRY_DNS_NAME}:${LOCAL_REGISTRY_PORT}/localimages/local-release-image 2>&1 | tee ${MIRROR_LOG_FILE}
     echo "export MIRRORED_RELEASE_IMAGE=$OPENSHIFT_RELEASE_IMAGE" > /tmp/mirrored_release_image
 
diff --git a/utils.sh b/utils.sh
index 803c1024b..cd598107f 100644
--- a/utils.sh
+++ b/utils.sh
@@ -49,11 +49,16 @@ function create_cluster() {
     mkdir -p ${assets_dir}/openshift
     cp -rf assets/generated/*.yaml ${assets_dir}/openshift
 
+    # Ensure release image signature config map is applied to cluster
+    if [ -d "$OCP_DIR/release-image-signature" ]; then
+      cp "$OCP_DIR/release-image-signature/*.yaml" "${assets_dir}/openshift" || true
+    fi
+
     if [ ! -z "${IGNITION_EXTRA:-}" ]; then
       $OPENSHIFT_INSTALLER --dir "${assets_dir}" --log-level=debug create ignition-configs
       if ! jq . ${IGNITION_EXTRA}; then
         echo "Error ${IGNITION_EXTRA} not valid json"
-	exit 1
+	      exit 1
       fi
       mv ${assets_dir}/master.ign ${assets_dir}/master.ign.orig
       jq -s '.[0] * .[1]' ${IGNITION_EXTRA} ${assets_dir}/master.ign.orig | tee ${assets_dir}/master.ign
@@ -357,6 +362,7 @@ EOF
 
 _tmpfiles=
 function removetmp(){
-    [ -n "$_tmpfiles" ] && rm -rf $_tmpfiles || true
+  true
+#    [ -n "$_tmpfiles" ] && rm -rf $_tmpfiles || true
 }
 trap removetmp EXIT