diff --git a/site.conf b/site.conf
index 9cbd999..a185a94 100644
--- a/site.conf
+++ b/site.conf
@@ -49,8 +49,52 @@
         -- List of public keys of maintainers.
         pubkeys = {
                 'b35dfb30ab9f54064209d9cb6042d6509cdfdd19352798ef6c3fd61787d4008f', -- JohnnyBee
+                '7b6989901962d8a4c4db392facb80271ae545120929d7d23daf2c66c736e5159', -- FatherJenkins
         },
       },
+
+      testbranch = {
+        name = 'testbranch',
+
+        -- List of mirrors to fetch images from. IPv6 required!
+        mirrors = {
+                'http://[fdd3:5d20:b5dd:fe00::51]/testbranch/wireguard/sysupgrade',
+        },
+
+        -- Number of good signatures required.
+        -- Have multiple maintainers sign your build and only
+        -- accept it when a sufficient number of them have
+        -- signed it.
+        good_signatures = 1,
+
+        -- List of public keys of maintainers.
+        pubkeys = {
+                'b35dfb30ab9f54064209d9cb6042d6509cdfdd19352798ef6c3fd61787d4008f', -- JohnnyBee
+                '7b6989901962d8a4c4db392facb80271ae545120929d7d23daf2c66c736e5159', -- FatherJenkins
+        },
+      },
+
+      devbranch = {
+        name = 'devbranch',
+
+        -- List of mirrors to fetch images from. IPv6 required!
+        mirrors = {
+                'http://[fdd3:5d20:b5dd:fe00::51]/devbranch/wireguard/sysupgrade',
+        },
+
+        -- Number of good signatures required.
+        -- Have multiple maintainers sign your build and only
+        -- accept it when a sufficient number of them have
+        -- signed it.
+        good_signatures = 1,
+
+        -- List of public keys of maintainers.
+        pubkeys = {
+                'b35dfb30ab9f54064209d9cb6042d6509cdfdd19352798ef6c3fd61787d4008f', -- JohnnyBee
+                '7b6989901962d8a4c4db392facb80271ae545120929d7d23daf2c66c736e5159', -- FatherJenkins
+        },
+      },
+
     },
   },
 
diff --git a/site.mk b/site.mk
index 97cd619..b4ea8ea 100644
--- a/site.mk
+++ b/site.mk
@@ -185,7 +185,7 @@ GLUON_tp-link-tl-wdr4900-v1_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKA
 #               to decide if a version is newer or not.
 
 #DEFAULT_GLUON_RELEASE := 0.6+mstr$(shell date '+%Y%m%d')
-DEFAULT_GLUON_RELEASE := v2019.1.1-Wireguard
+DEFAULT_GLUON_RELEASE ?= v2019.1.1-Wireguard
 
 
 ##      GLUON_RELEASE