diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb
index a8dc39d..2a4f9c6 100644
--- a/recipes-osmocom/meta/meta-toolchain-osmo.bb
+++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb
@@ -1,7 +1,8 @@
 TOOLCHAIN_TARGET_OSMOTASK ?= "packagegroup-core-standalone-osmo-sdk-target"
 TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}"
-TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}"
-TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DATETIME}"
+TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo"
+TOOLCHAIN_OUTPUT_VERNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DISTRO_VERSION}"
+TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_VERNAME}-${DATETIME}"
 TOOLCHAIN_OUTPUTNAME[vardepsexclude] = "DATETIME"
 TOOLCHAIN_HOST_TASK_append = " nativesdk-python-argparse"
 PROVIDES = "meta-toolchain-sdk"
@@ -15,6 +16,7 @@
 create_symlink() {
         cd ${SDKDEPLOYDIR}/
 
-        rm -f ${TOOLCHAIN_OUTPUT_BASENAME}.sh
+        rm -f ${TOOLCHAIN_OUTPUT_BASENAME}.sh ${TOOLCHAIN_OUTPUT_VERNAME}.sh
+        ln -s ${TOOLCHAIN_OUTPUTNAME}.sh ${TOOLCHAIN_OUTPUT_VERNAME}.sh
         ln -s ${TOOLCHAIN_OUTPUTNAME}.sh ${TOOLCHAIN_OUTPUT_BASENAME}.sh
 }