diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
index 6939942..7bbbe5b 100644
--- a/.github/workflows/MainDistributionPipeline.yml
+++ b/.github/workflows/MainDistributionPipeline.yml
@@ -20,4 +20,3 @@ jobs:
       ci_tools_version: main
       extension_name: capi_quack
       extra_toolchains: python3
-      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dafdd75..b094206 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
+option(DUCKDB_WASM_EXTENSIONS "Whether compiling for Wasm target" OFF)
 
 ###
 # Configuration
@@ -26,7 +27,12 @@ set(EXTENSION_SOURCES
         src/add_numbers.c
         src/capi_quack.c
 )
-add_library(${EXTENSION_NAME} SHARED ${EXTENSION_SOURCES})
+
+if (DUCKDB_WASM_EXTENSION)
+	add_library(${EXTENSION_NAME} STATIC ${EXTENSION_SOURCES})
+else()
+	add_library(${EXTENSION_NAME} SHARED ${EXTENSION_SOURCES})
+endif()
 
 # Hide symbols
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
diff --git a/extension-ci-tools b/extension-ci-tools
index 871db4d..afbb4dc 160000
--- a/extension-ci-tools
+++ b/extension-ci-tools
@@ -1 +1 @@
-Subproject commit 871db4d06e0d71769f737fb16301b287b25351cc
+Subproject commit afbb4dcfa3afa6f627976a5f2d2cf8ae2f40be73