diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b42a361..8c64bc5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -987,8 +987,8 @@ jobs:
           export PATH="/usr/lib/ccache:${PATH}"
           pushd deps/PawPaw; source local.env win32; popd
           make carla-win32 -j $(nproc)
-          make -C carla DGL_NAMESPACE=CardinalDGL EMBED_TARGET=true TESTING=true dist
-          make -C carla DGL_NAMESPACE=CardinalDGL EMBED_TARGET=true TESTING=true dist
+          make -C carla EMBED_TARGET=true TESTING=true dist
+          make -C carla EMBED_TARGET=true TESTING=true dist
       - name: Build win32 cross-compiled (packaging)
         if: steps.cache.outputs.cache-hit == 'true'
         run: |
@@ -1083,8 +1083,8 @@ jobs:
           export PATH="/usr/lib/ccache:${PATH}"
           pushd deps/PawPaw; source local.env win64; popd
           make carla-win32 -j $(nproc)
-          make -C carla DGL_NAMESPACE=CardinalDGL EMBED_TARGET=true TESTING=true dist
-          make -C carla DGL_NAMESPACE=CardinalDGL EMBED_TARGET=true TESTING=true dist
+          make -C carla EMBED_TARGET=true TESTING=true dist
+          make -C carla EMBED_TARGET=true TESTING=true dist
       - name: Build win64 cross-compiled (packaging)
         if: steps.cache.outputs.cache-hit == 'true'
         run: |
diff --git a/Makefile b/Makefile
index 92f311d..c18ae9f 100644
--- a/Makefile
+++ b/Makefile
@@ -172,6 +172,7 @@ ifneq ($(STATIC_BUILD),true)
 	$(MAKE) all -C carla $(CARLA_EXTRA_ARGS) \
 		CAN_GENERATE_LV2_TTL=false \
 		CUSTOM_DPF_PATH=$(CURDIR)/dpf \
+		DGL_NAMESPACE=CardinalDGL \
 		HAVE_FRONTEND=true \
 		HAVE_PYQT=true \
 		HAVE_QT5=true \
@@ -182,6 +183,7 @@ ifeq ($(CPU_X86_64),true)
 	$(MAKE) win32r -C carla $(CARLA_EXTRA_ARGS) \
 		CAN_GENERATE_LV2_TTL=false \
 		CUSTOM_DPF_PATH=$(CURDIR)/dpf \
+		DGL_NAMESPACE=CardinalDGL \
 		HAVE_FRONTEND=true \
 		HAVE_PYQT=true \
 		HAVE_QT5=true \
diff --git a/carla b/carla
index 6f22f09..cf11562 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit 6f22f09d230236d2a8bbdd662d46146d81b318b1
+Subproject commit cf11562c505407f12a6e6d085ca448fefd7399ba