diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eed73e6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+site-ffrgb.code-workspace
diff --git a/Makefile b/Makefile
index ac8cf10..279c35a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
-GLUON_GIT_REF := bbc00017a922fc691297c3ca1263cb7057f63e24
+GLUON_GIT_REF := v2021.1.1
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
 
 GLUON_TARGETS ?= \
+        x86-generic \
 	ar71xx-generic \
 	ar71xx-tiny \
 	ar71xx-nand \
diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf
index fe27eac..a228753 100644
--- a/domains/ffrgb_cty.conf
+++ b/domains/ffrgb_cty.conf
@@ -6,8 +6,6 @@
   prefix6 = 'fdef:f10f:1337:cafe::/64',
   extra_prefixes6 = {'2a00:9d80:6000:0101::/64', '2001:678:ddc:11::/64', '2001:678:e64:12::/64'},
 
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
-
   wifi24 = {
     channel = 1,
     htmode = 'HT20',
@@ -53,6 +51,19 @@
 
   mesh_vpn = {
     mtu = 1312,
+    wireguard = {
+      enabled = 'true',
+      iface = 'wg_mesh_vpn',
+      limit = '1', -- actually unused
+      peers = {
+        {
+          publickey ='zqBVQJlzkZxk5YT04dv4cIrYoDYpx0xBxK/6gV2PZXE=',
+          endpoint ='gw11.ffrgb.net:20010',
+          broker ='gw11.ffrgb.net',
+          link_address='fe80::11',
+        },
+      },
+    },
     fastd = {
       groups = {
         backbone = {
diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf
index b938fb6..4ad4b02 100644
--- a/domains/ffrgb_tst.conf
+++ b/domains/ffrgb_tst.conf
@@ -7,8 +7,6 @@
   prefix6 = 'fdef:f30f:1337:cafe::/64',
   extra_prefixes6 = {'2a00:9d80:6000:0103::/64', '2001:678:ddc:31::/64', '2001:678:e64:32::/64'},
 
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
-
   wifi24 = {
     channel = 1,
     htmode = 'HT20',
@@ -24,7 +22,7 @@
     channel = 44,
     htmode = 'HT20',
     ap = {
-      ssid = 'test.freifunk.net',
+      ssid = 'test.ffrgb.net',
     },
     mesh = {
       id = 'mesh_ffrgb_tst_11s',
@@ -54,6 +52,19 @@
 
   mesh_vpn = {
     mtu = 1312,
+    wireguard = {
+      enabled = 'true',
+      iface = 'wg_mesh_vpn',
+      limit = '1', -- actually unused
+      peers = {
+        {
+          publickey ='SfVwYUjy2b9AZ+R/JTwmLXz5jm1UEmnfuRMGpN9B4X4=',
+          endpoint ='gw31.ffrgb.net:20030',
+          broker ='gw31.ffrgb.net',
+          link_address='fe80::31',
+        },
+      },
+    },
     fastd = {
       groups = {
         backbone = {
diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf
index 4093b28..3cf3944 100644
--- a/domains/ffrgb_uml.conf
+++ b/domains/ffrgb_uml.conf
@@ -6,8 +6,6 @@
   prefix6 = 'fdef:f20f:1337:cafe::/64',
   extra_prefixes6 = {'2a00:9d80:6000:0102::/64', '2001:678:ddc:21::/64', '2001:678:e64:22::/64'},
 
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
-
   wifi24 = {
     channel = 1,
     htmode = 'HT20',
@@ -53,6 +51,19 @@
 
   mesh_vpn = {
     mtu = 1312,
+    wireguard = {
+      enabled = 'true',
+      iface = 'wg_mesh_vpn',
+      limit = '1', -- actually unused
+      peers = {
+        {
+          publickey ='MqzXEqO4US16rSGxsF2oHuSdMAy/Qimy+GUSeCob+U0=',
+          endpoint ='gw21.ffrgb.net:20020',
+          broker ='gw21.ffrgb.net',
+          link_address='fe80::21',
+        },
+      },
+    },
     fastd = {
       groups = {
         backbone = {
diff --git a/modules b/modules
index 6e15995..8164b17 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,7 @@
-GLUON_SITE_FEEDS='ffrgb'
+GLUON_SITE_FEEDS='ffrgb community'
 PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git
 PACKAGES_FFRGB_BRANCH=master
 PACKAGES_FFRGB_COMMIT=af2c608f31e264a279b919814896e4470c455e72
+PACKAGES_COMMUNITY_REPO=https://github.com/ffrgb/community-packages.git
+PACKAGES_COMMUNITY_BRANCH=gluon-mesh-vpn-wireguard-vxlan
+PACKAGES_COMMUNITY_COMMIT=43289c587312cb896a71a327b6a0972498dc76aa
diff --git a/site.conf b/site.conf
index d5de36a..caf18a4 100644
--- a/site.conf
+++ b/site.conf
@@ -9,7 +9,7 @@
   },
 
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
+  ntp_servers = {'ntp.ffrgb.net'},
 
   mesh_on_wan = false,
 
diff --git a/site.mk b/site.mk
index 4f654d3..e3edb2b 100644
--- a/site.mk
+++ b/site.mk
@@ -5,10 +5,10 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
 	gluon-config-mode-domain-select \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-contact-info \
+	gluon-config-mode-mesh-vpn \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-ebtables-source-filter \
@@ -16,7 +16,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-web-autoupdater \
 	gluon-web-network \
 	gluon-web-wifi-config \
-	gluon-web-mesh-vpn-fastd \
 	gluon-web-private-wifi \
 	gluon-radvd \
 	gluon-setup-mode \
@@ -26,6 +25,7 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	gluon-ssid-changer \
 	respondd-module-airtime \
+	gluon-mesh-vpn-wireguard-vxlan \
 	ffrgb-banner #\
 	#ffho-site-generate \
 	#ffho-config-mode-site-select \