diff --git a/daed-next/Makefile b/daed-next/Makefile
index f0c24a165..a98b3e005 100644
--- a/daed-next/Makefile
+++ b/daed-next/Makefile
@@ -70,16 +70,16 @@ define Build/Prepare
 	( \
 	$(TAR) --strip-components=1 -C $(PKG_BUILD_DIR)/../ -xzf $(DL_DIR)/$(PKG_NAME)-$(PKG_VERSION).tar.gz ; \
 	rm -rf $(PKG_BUILD_DIR) && git clone https://github.com/daeuniverse/dae-wing $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/wing ; \
-	pushd $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/wing ; \
-	go get -u ; \
-	go mod tidy ; \
-	popd ; \
 	rm -rf $(PKG_BUILD_DIR)/dae-core && git clone https://github.com/daeuniverse/dae $(PKG_BUILD_DIR)/dae-core ; \
+	rm -rf $(PKG_BUILD_DIR)/dae-core/control/kern/headers && git clone https://github.com/daeuniverse/dae_bpf_headers $(PKG_BUILD_DIR)/dae-core/control/kern/headers ; \
 	pushd $(PKG_BUILD_DIR)/dae-core ; \
 	go get -u ; \
 	go mod tidy ; \
 	popd ; \
-	rm -rf $(PKG_BUILD_DIR)/dae-core/control/kern/headers && git clone https://github.com/daeuniverse/dae_bpf_headers $(PKG_BUILD_DIR)/dae-core/control/kern/headers ; \
+	pushd $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/wing ; \
+	go get -u ; \
+	go mod tidy ; \
+	popd ; \
 	)
 endef
 
diff --git a/natter2/Makefile b/natter2/Makefile
index d3d197aac..02783ef73 100755
--- a/natter2/Makefile
+++ b/natter2/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=natter2
-PKG_VERSION=2.0.0-rc2
+PKG_VERSION=2.0.0-rc3
 PKG_RELEASE:=$(AUTORELEASE)
-PKG_SOURCE_VERSION:=6e1c66db06e1bb746e55288da1b9fb012bf701b5
+PKG_SOURCE_VERSION:=3a11cf0164794570d677d3ef8d31e68b984d8a6b
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz