diff --git a/Makefile b/Makefile
index 8143e3c247..69f3795c00 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,10 @@ ifeq ($(CONFIG_ARCH_SM8150), y)
 include $(srctree)/techpack/audio/config/sdm855auto.conf
 export
 endif
+ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+include $(srctree)/techpack/audio/config/sdm855auto.conf
+export
+endif
 
 # Use USERINCLUDE when you must reference the UAPI directories only.
 USERINCLUDE     += \
@@ -42,6 +46,10 @@ ifeq ($(CONFIG_ARCH_SM8150), y)
 LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/sdm855autoconf.h
 endif
+ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+LINUXINCLUDE    += \
+                -include $(srctree)/techpack/audio/config/sdm855autoconf.h
+endif
 
 obj-y += asoc/
 obj-y += dsp/
diff --git a/asoc/Kbuild b/asoc/Kbuild
index 5369444038..453452c621 100644
--- a/asoc/Kbuild
+++ b/asoc/Kbuild
@@ -35,6 +35,11 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+		include $(AUDIO_ROOT)/config/sdm855auto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+	endif
 endif
 
 # As per target team, build is done as follows:
diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild
index c42cb7a268..412ec681c7 100644
--- a/asoc/codecs/Kbuild
+++ b/asoc/codecs/Kbuild
@@ -34,6 +34,11 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+		include $(AUDIO_ROOT)/config/sdm855auto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+	endif
 endif
 
 # As per target team, build is done as follows:
diff --git a/asoc/codecs/aqt1000/Kbuild b/asoc/codecs/aqt1000/Kbuild
index 6ee5d3f811..948471442f 100644
--- a/asoc/codecs/aqt1000/Kbuild
+++ b/asoc/codecs/aqt1000/Kbuild
@@ -28,6 +28,12 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
 	endif
+
+	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+		include $(AUDIO_ROOT)/config/sdm855auto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+	endif
 endif
 
 # As per target team, build is done as follows:
diff --git a/asoc/codecs/wcd934x/Kbuild b/asoc/codecs/wcd934x/Kbuild
index 48c9ccdc0f..ee83206356 100644
--- a/asoc/codecs/wcd934x/Kbuild
+++ b/asoc/codecs/wcd934x/Kbuild
@@ -36,6 +36,11 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+		include $(AUDIO_ROOT)/config/sdm855auto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+	endif
 endif
 
 # As per target team, build is done as follows:
diff --git a/asoc/codecs/wcd9360/Kbuild b/asoc/codecs/wcd9360/Kbuild
index d4f5406337..d9053a34a0 100644
--- a/asoc/codecs/wcd9360/Kbuild
+++ b/asoc/codecs/wcd9360/Kbuild
@@ -21,6 +21,12 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
 	endif
+
+	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+		include $(AUDIO_ROOT)/config/sdm855auto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+	endif
 endif
 
 # As per target team, build is done as follows:
diff --git a/dsp/Kbuild b/dsp/Kbuild
index 9b43994240..11f63dc14e 100644
--- a/dsp/Kbuild
+++ b/dsp/Kbuild
@@ -34,6 +34,11 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+		include $(AUDIO_ROOT)/config/sdm855auto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+	endif
 endif
 
 
diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild
index 96875c6557..09d7726062 100644
--- a/dsp/codecs/Kbuild
+++ b/dsp/codecs/Kbuild
@@ -35,6 +35,11 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+		include $(AUDIO_ROOT)/config/sdm855auto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+	endif
 endif
 
 # As per target team, build is done as follows:
diff --git a/ipc/Kbuild b/ipc/Kbuild
index b666875a87..a9bda63f4b 100644
--- a/ipc/Kbuild
+++ b/ipc/Kbuild
@@ -20,6 +20,10 @@ ifeq ($(CONFIG_ARCH_SM8150), y)
 	TARGET_KERNEL_VERSION := 4.14
 endif
 
+ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+	TARGET_KERNEL_VERSION := 4.14
+endif
+
 KDIR := $(TOP)/kernel/msm-$(TARGET_KERNEL_VERSION)
 
 ifeq ($(KERNEL_BUILD), 1)
@@ -47,6 +51,11 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+		include $(AUDIO_ROOT)/config/sdm855auto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+	endif
 endif
 
 # As per target team, build is done as follows:
diff --git a/soc/Kbuild b/soc/Kbuild
index f2b884013d..8339028a5a 100644
--- a/soc/Kbuild
+++ b/soc/Kbuild
@@ -34,6 +34,11 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+		include $(AUDIO_ROOT)/config/sdm855auto.conf
+		export
+		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+	endif
 endif
 
 # As per target team, build is done as follows: