diff --git a/carla b/carla
index adc55af..5d0d243 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit adc55af80cf797b7dd245a6f66a99bce65193937
+Subproject commit 5d0d243be13e2088e2c82d4d0bcc947edcd1b64d
diff --git a/dpf b/dpf
index aeeb2cb..90004b0 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit aeeb2cbe1b984d76e336f0413f79811de26242ae
+Subproject commit 90004b0d43875c3754142114112148b593615352
diff --git a/jucewrapper/CMakeLists.txt b/jucewrapper/CMakeLists.txt
index 5fec6cd..3d344ba 100644
--- a/jucewrapper/CMakeLists.txt
+++ b/jucewrapper/CMakeLists.txt
@@ -14,40 +14,7 @@ add_library(dgl STATIC IMPORTED)
 set_property(TARGET dgl PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../dpf/build/libdgl-opengl.a")
 
 add_library(carla_host_plugin STATIC IMPORTED)
-set_property(TARGET carla_host_plugin PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/plugin/${CMAKE_BUILD_TYPE}/carla-host-plugin.cpp.o")
-
-add_library(carla_engine_plugin STATIC IMPORTED)
-set_property(TARGET carla_engine_plugin PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/carla_engine_plugin.a")
-
-add_library(carla_plugin STATIC IMPORTED)
-set_property(TARGET carla_plugin PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/carla_plugin.a")
-
-add_library(native_plugins STATIC IMPORTED)
-set_property(TARGET native_plugins PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/native-plugins.a")
-
-add_library(audio_decoder STATIC IMPORTED)
-set_property(TARGET audio_decoder PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/audio_decoder.a")
-
-add_library(jackbridge STATIC IMPORTED)
-set_property(TARGET jackbridge PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/jackbridge.min.a")
-
-add_library(lilv STATIC IMPORTED)
-set_property(TARGET lilv PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/lilv.a")
-
-add_library(rtmempool STATIC IMPORTED)
-set_property(TARGET rtmempool PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/rtmempool.a")
-
-add_library(sfzero STATIC IMPORTED)
-set_property(TARGET sfzero PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/sfzero.a")
-
-add_library(water STATIC IMPORTED)
-set_property(TARGET water PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/water.a")
-
-add_library(ysfx STATIC IMPORTED)
-set_property(TARGET ysfx PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/ysfx.a")
-
-add_library(zita_resampler STATIC IMPORTED)
-set_property(TARGET zita_resampler PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/${CMAKE_BUILD_TYPE}/zita-resampler.a")
+set_property(TARGET carla_host_plugin PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/bin/libcarla_host-plugin.a")
 
 add_library(sCardinal STATIC IMPORTED)
 set_property(TARGET sCardinal PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../bin/Cardinal.a")
@@ -193,17 +160,6 @@ target_link_libraries(Cardinal
         sCardinal
         sRack
         carla_host_plugin
-        carla_engine_plugin
-        carla_plugin
-        native_plugins
-        audio_decoder
-        jackbridge
-        lilv
-        rtmempool
-        sfzero
-        water
-        ysfx
-        zita_resampler
         dgl
         surgedep01
         surgedep02
@@ -296,17 +252,6 @@ target_link_libraries(CardinalFX
         sCardinalFX
         sRack
         carla_host_plugin
-        carla_engine_plugin
-        carla_plugin
-        native_plugins
-        audio_decoder
-        jackbridge
-        lilv
-        rtmempool
-        sfzero
-        water
-        ysfx
-        zita_resampler
         dgl
         surgedep01
         surgedep02
@@ -398,17 +343,6 @@ target_link_libraries(CardinalMIDI
         sCardinalFX
         sRack
         carla_host_plugin
-        carla_engine_plugin
-        carla_plugin
-        native_plugins
-        audio_decoder
-        jackbridge
-        lilv
-        rtmempool
-        sfzero
-        water
-        ysfx
-        zita_resampler
         dgl
         surgedep01
         surgedep02
@@ -500,17 +434,6 @@ target_link_libraries(CardinalSynth
         sCardinalSynth
         sRack
         carla_host_plugin
-        carla_engine_plugin
-        carla_plugin
-        native_plugins
-        audio_decoder
-        jackbridge
-        lilv
-        rtmempool
-        sfzero
-        water
-        ysfx
-        zita_resampler
         dgl
         surgedep01
         surgedep02
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 8d2f687..ce80d65 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -25,31 +25,8 @@ ifneq ($(CARDINAL_VARIANT),mini)
 ifneq ($(STATIC_BUILD),true)
 
 STATIC_PLUGIN_TARGET = true
-
-CWD = ../../carla/source
-include $(CWD)/Makefile.deps.mk
-
-CARLA_BUILD_DIR = ../../carla/build
-ifeq ($(DEBUG),true)
-CARLA_BUILD_TYPE = Debug
-else
-CARLA_BUILD_TYPE = Release
-endif
-
-CARLA_EXTRA_LIBS  = $(CARLA_BUILD_DIR)/plugin/$(CARLA_BUILD_TYPE)/carla-host-plugin.cpp.o
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_engine_plugin.a
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_plugin.a
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/native-plugins.a
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/audio_decoder.a
-ifneq ($(WASM),true)
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/jackbridge.min.a
-endif
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/lilv.a
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/rtmempool.a
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/sfzero.a
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/water.a
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/ysfx.a
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/zita-resampler.a
+CARLA_EXTRA_LIBS = ../../carla/bin/libcarla_host-plugin.a
+include ../../carla/source/Makefile.deps.mk
 
 endif # STATIC_BUILD
 endif # CARDINAL_VARIANT mini