diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg
index 028aaecc..f0e044fb 100644
--- a/kickstart/files/kickstart.cfg
+++ b/kickstart/files/kickstart.cfg
@@ -3148,6 +3148,20 @@ else
     fi
 fi
 
+# Copy current release scripts to software directory
+highest_patch_version="0"
+for metadata_file in /instboot/patches/*; do
+    patch_version=$(grep "sw_version" $metadata_file | cut -d"." -f3 | cut -d'<' -f1)
+    if [ $patch_version -gt $highest_patch_version ]; then
+        highest_patch_version=$patch_version;
+    fi;
+done;
+
+versioned_dir="/opt/software/rel-${sw_release}.${highest_patch_version}/bin"
+ilog "Creating versioned USM scripts directory $versioned_dir for current release"
+mkdir -p "${IMAGE_ROOTFS}/var/rootdirs/${versioned_dir}"
+cp -r /instboot/upgrades/software-deploy/* ${IMAGE_ROOTFS}/var/rootdirs/${versioned_dir}
+
 # Save the install scripts and kickstart logs
 mount /dev/mapper/cgts--vg-log--lv "${IMAGE_ROOTFS}/${LOG_DIR}"
 if [ ${?} -ne 0 ] ; then