diff --git a/.github/build/linux/debug.sh b/.github/build/linux/debug.sh
index fe4a073..1140974 100755
--- a/.github/build/linux/debug.sh
+++ b/.github/build/linux/debug.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-make debug
\ No newline at end of file
+#make debug
\ No newline at end of file
diff --git a/.github/build/linux/init.sh b/.github/build/linux/init.sh
index 47f85d7..e3eb2f5 100755
--- a/.github/build/linux/init.sh
+++ b/.github/build/linux/init.sh
@@ -2,3 +2,4 @@
 sudo apt update && sudo apt install gcc-multilib g++-multilib -y
 git clone https://github.com/thecybermind/qmm2.git ../qmm2
 git clone https://github.com/thecybermind/qmm_sdks.git ../qmm_sdks
+git clone https://github.com/thecybermind/sof2gt_qmm.git ../sof2gt_qmm
diff --git a/.github/build/linux/package.sh b/.github/build/linux/package.sh
index 43f6ad9..3825a09 100755
--- a/.github/build/linux/package.sh
+++ b/.github/build/linux/package.sh
@@ -5,9 +5,8 @@ rm -f *
 cp ../README.md ./
 cp ../LICENSE ./
 
-for f in SOF2MP; do
-  cp ../bin/release-$f/x86/stub_sof2gt_$f.so ./
-  cp ../bin/release-$f/x86_64/stub_sof2gt_x86_64_$f.so ./
-done
+#for f in SOF2MP; do
+#  cp ../bin/release-$f/x86/stub_sof2gt_$f.so ./
+#done
 
 cd ..
diff --git a/.github/build/linux/release.sh b/.github/build/linux/release.sh
index 29e4591..10148bf 100755
--- a/.github/build/linux/release.sh
+++ b/.github/build/linux/release.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-make release
+#make release
diff --git a/.github/build/windows/debug.bat b/.github/build/windows/debug.bat
index ed0415a..7885351 100644
--- a/.github/build/windows/debug.bat
+++ b/.github/build/windows/debug.bat
@@ -1,4 +1,3 @@
 for %%x in (SOF2MP) do (
     msbuild .\msvc\stub_sof2gt.vcxproj /p:Configuration=Debug-%%x /p:Platform=x86
-    msbuild .\msvc\stub_sof2gt.vcxproj /p:Configuration=Debug-%%x /p:Platform=x64
 )
diff --git a/.github/build/windows/init.bat b/.github/build/windows/init.bat
index 7ef0eb3..095fd69 100644
--- a/.github/build/windows/init.bat
+++ b/.github/build/windows/init.bat
@@ -1,2 +1,3 @@
 git clone https://github.com/thecybermind/qmm2.git ../qmm2
 git clone https://github.com/thecybermind/qmm_sdks.git ../qmm_sdks
+git clone https://github.com/thecybermind/sof2gt_qmm.git ../sof2gt_qmm
diff --git a/.github/build/windows/package.bat b/.github/build/windows/package.bat
index 2ed9725..b690ea1 100644
--- a/.github/build/windows/package.bat
+++ b/.github/build/windows/package.bat
@@ -6,6 +6,5 @@ rem copy ..\LICENSE .\
 
 for %%x in (SOF2MP) do (
     copy ..\bin\Release-%%x\x86\stub_sof2gt_%%x.dll .\
-    copy ..\bin\Release-%%x\x64\stub_sof2gt_x86_64_%%x.dll .\     
 )
 popd
diff --git a/.github/build/windows/release.bat b/.github/build/windows/release.bat
index b37ff72..766d4cc 100644
--- a/.github/build/windows/release.bat
+++ b/.github/build/windows/release.bat
@@ -1,4 +1,3 @@
 for %%x in (SOF2MP) do (
     msbuild .\msvc\stub_sof2gt.vcxproj /p:Configuration=Release-%%x /p:Platform=x86
-    msbuild .\msvc\stub_sof2gt.vcxproj /p:Configuration=Release-%%x /p:Platform=x64
 )
diff --git a/Makefile b/Makefile
index 314b030..cffb795 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ SRC_FILES := $(wildcard $(SRC_DIR)/*.cpp)
 
 OBJ_FILES := $(SRC_FILES:$(SRC_DIR)/%.cpp=%.o)
 
-CPPFLAGS := -MMD -MP -I ./include -isystem ../qmm_sdks -isystem ../qmm2/include
+CPPFLAGS := -MMD -MP -I ./include -isystem ../qmm_sdks -isystem ../qmm2/include -isystem ../sof2gt_qmm/include
 CFLAGS   := -Wall -pipe -fPIC
 LDFLAGS  := -shared -fPIC
 LDLIBS   :=