diff --git a/meta-aspeed/classes/otptool.bbclass b/meta-aspeed/classes/otptool.bbclass
index bb766c1..5262519 100644
--- a/meta-aspeed/classes/otptool.bbclass
+++ b/meta-aspeed/classes/otptool.bbclass
@@ -17,8 +17,12 @@
     elif [ ! -d "${OTPTOOL_KEY_DIR}" ] ; then
         bbfatal "Invalid otptool signing key directory: ${OTPTOOL_KEY_DIR}"
     else
+        otptool_config_slug="$(basename ${OTPTOOL_CONFIG} .json)"
+        otptool_config_outdir="${B}"/"${CONFIG_B_PATH}"/"${otptool_config_slug}"
+        mkdir -p "${otptool_config_outdir}"
         otptool make_otp_image \
             --key_folder ${OTPTOOL_KEY_DIR} \
+            --output_folder "${otptool_config_outdir}" \
             ${OTPTOOL_CONFIG} \
             ${OTPTOOL_EXTRA_OPTS}
 
@@ -26,15 +30,15 @@
             bbfatal "Generated OTP image failed."
         fi
 
-        otptool \
-            print \
-            ${B}/${CONFIG_B_PATH}/otp-all.image
+        otptool print "${otptool_config_outdir}"/otp-all.image
 
         if [ $? -ne 0 ]; then
             bbfatal "Printed OTP image failed."
         fi
 
-        install -m 0644 ${B}/${CONFIG_B_PATH}/otp-* ${DEPLOYDIR}
+        install -m 0644 -T \
+            "${otptool_config_outdir}"/otp-all.image \
+            ${DEPLOYDIR}/"${otptool_config_slug}"-otp-all.image
     fi
 }