diff --git a/site_config/beta/site/site.conf b/site_config/beta/site/site.conf
index 7d4c36b72ae8781d81c8e9d10efcf744b3362f72..9b6f5420db905a977aa7820fed7faf2e590c2e6d 100644
--- a/site_config/beta/site/site.conf
+++ b/site_config/beta/site/site.conf
@@ -87,8 +87,8 @@
   -- what these options do.
   mesh_vpn = {
     enabled = true,
-    mtu = 1406,
    fastd = {
+    mtu = 1406,
     configurable = true,
     -- List of crypto-methods to use.
     methods = {'salsa2012+umac'},
diff --git a/site_config/beta/site/site.mk b/site_config/beta/site/site.mk
index 6e0af6a1723434029026d8372ff0fd9a01944929..ea2538eb904a39ea8ae11b189777896cf4e3509b 100644
--- a/site_config/beta/site/site.mk
+++ b/site_config/beta/site/site.mk
@@ -47,7 +47,9 @@ GLUON_SITE_PACKAGES := \
 		gluon-ssid-changer \
 		respondd-module-airtime \
 		iwinfo \
-		iptables \
+		# freifunk-gluon/gluon #2046 - Builds fail with iptables in GLUON_SITE_PACKAGES
+		# Note that iptables is an OpenWrt core package that is included by default (which is what triggered this bug).
+		#iptables \
 
 ##	DEFAULT_GLUON_RELEASE
 #		version string to use for images
@@ -55,7 +57,8 @@ GLUON_SITE_PACKAGES := \
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d')
-DEFAULT_GLUON_RELEASE := 2021.1.2.1~beta20220507
+# Naming after gluon: v2023.1 = 2023.1.0, as they might release v2023.1.1 = 2023.1.1
+DEFAULT_GLUON_RELEASE := 2023.1.0.0~beta20240603
 
 
 ##	GLUON_RELEASE
diff --git a/site_config/stable/site/site.conf b/site_config/stable/site/site.conf
index 7d4c36b72ae8781d81c8e9d10efcf744b3362f72..9b6f5420db905a977aa7820fed7faf2e590c2e6d 100644
--- a/site_config/stable/site/site.conf
+++ b/site_config/stable/site/site.conf
@@ -87,8 +87,8 @@
   -- what these options do.
   mesh_vpn = {
     enabled = true,
-    mtu = 1406,
    fastd = {
+    mtu = 1406,
     configurable = true,
     -- List of crypto-methods to use.
     methods = {'salsa2012+umac'},
diff --git a/site_config/stable/site/site.mk b/site_config/stable/site/site.mk
index 9537eaba492972be3f84820d42d990629d9a9419..fa745b8af8e7debddac7b8424f552d65baf3d75f 100644
--- a/site_config/stable/site/site.mk
+++ b/site_config/stable/site/site.mk
@@ -47,7 +47,9 @@ GLUON_SITE_PACKAGES := \
 		gluon-ssid-changer \
 		respondd-module-airtime \
 		iwinfo \
-		iptables \
+		# freifunk-gluon/gluon #2046 - Builds fail with iptables in GLUON_SITE_PACKAGES
+		# Note that iptables is an OpenWrt core package that is included by default (which is what triggered this bug).
+		#iptables \
 
 ##	DEFAULT_GLUON_RELEASE
 #		version string to use for images
@@ -55,7 +57,8 @@ GLUON_SITE_PACKAGES := \
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d')
-DEFAULT_GLUON_RELEASE := 2021.1.2~stable202205
+# Naming after gluon: v2023.1 = 2023.1.0, as they might release v2023.1.1 = 2023.1.1
+DEFAULT_GLUON_RELEASE := 2023.1.0~stable20240604
 
 
 ##	GLUON_RELEASE