diff --git a/cmake/toolchain/zephyr/target.cmake b/cmake/toolchain/zephyr/target.cmake
index d92f0139114..b5b01c63f9e 100644
--- a/cmake/toolchain/zephyr/target.cmake
+++ b/cmake/toolchain/zephyr/target.cmake
@@ -6,4 +6,29 @@ if(${SDK_VERSION} VERSION_LESS_EQUAL 0.11.2)
   include(${CMAKE_CURRENT_LIST_DIR}/${SDK_MAJOR_MINOR}/target.cmake)
 else()
   include(${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr/target.cmake)
+
+  # Workaround, FIXME
+  if("${ARCH}" STREQUAL "xtensa")
+    if("${SOC_SERIES}" STREQUAL "cavs_v15")
+      set(SR_XT_TC_SOC intel_apl_adsp)
+    elseif("${SOC_SERIES}" STREQUAL "cavs_v18")
+      set(SR_XT_TC_SOC intel_s1000)
+    elseif("${SOC_SERIES}" STREQUAL "cavs_v20")
+      set(SR_XT_TC_SOC intel_s1000)
+    elseif("${SOC_SERIES}" STREQUAL "cavs_v25")
+      set(SR_XT_TC_SOC intel_s1000)
+    elseif("${SOC_SERIES}" STREQUAL "baytrail_adsp")
+      set(SR_XT_TC_SOC intel_byt_adsp)
+    elseif("${SOC_SERIES}" STREQUAL "broadwell_adsp")
+      set(SR_XT_TC_SOC intel_bdw_adsp)
+    elseif("${SOC_SERIES}" STREQUAL "intel_s1000")
+      set(SR_XT_TC_SOC intel_s1000)
+    elseif("${SOC_NAME}" STREQUAL "sample_controller")
+      set(SR_XT_TC_SOC sample_controller)
+    else()
+      message(FATAL_ERROR "No compiler set for SOC_SERIES ${SOC_SERIES}")
+    endif()
+    set(SYSROOT_DIR ${TOOLCHAIN_HOME}/xtensa/${SR_XT_TC_SOC}/${SYSROOT_TARGET})
+    set(CROSS_COMPILE ${TOOLCHAIN_HOME}/xtensa/${SR_XT_TC_SOC}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-)
+  endif()
 endif()
diff --git a/soc/xtensa/intel_s1000/Kconfig.defconfig b/soc/xtensa/intel_s1000/Kconfig.defconfig
index 2724148c34c..1d9727ea13d 100644
--- a/soc/xtensa/intel_s1000/Kconfig.defconfig
+++ b/soc/xtensa/intel_s1000/Kconfig.defconfig
@@ -8,6 +8,10 @@ if SOC_INTEL_S1000
 config SOC
 	default "intel_s1000"
 
+config SOC_SERIES
+	string
+	default "intel_s1000"
+
 config IRQ_OFFLOAD_INTNUM
 	default 0