diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index deeff29..2ddaead 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -42,7 +42,7 @@ LOCALSTATEDIR="@LOCALSTATEDIR@"
 LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
 # Allows the lxc-cache directory to be set by environment variable
 LXC_CACHE_PATH=${LXC_CACHE_PATH:-"$LOCALSTATEDIR/cache/lxc"}
-[ -z "$DOWNLOAD_KEYRING" ] && DOWNLOAD_KEYRING=1
+DOWNLOAD_KEYRING=${DOWNLOAD_KEYRING:-1}
 
 find_interpreter()
 {
diff --git a/templates/lxc-devuan.in b/templates/lxc-devuan.in
index c1d7575..88db337 100644
--- a/templates/lxc-devuan.in
+++ b/templates/lxc-devuan.in
@@ -42,7 +42,7 @@ LOCALSTATEDIR="@LOCALSTATEDIR@"
 LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
 # Allows the lxc-cache directory to be set by environment variable
 LXC_CACHE_PATH=${LXC_CACHE_PATH:-"$LOCALSTATEDIR/cache/lxc"}
-[ -z "$DOWNLOAD_KEYRING" ] && DOWNLOAD_KEYRING=1
+DOWNLOAD_KEYRING=${DOWNLOAD_KEYRING:-1}
 
 find_interpreter()
 {
@@ -350,7 +350,7 @@ apt-transport-https
     elif [ "$DOWNLOAD_KEYRING" = 1 ]; then 
         [ ! -d "/etc/apt/trusted.gpg.d" ] && lreleasekeyring="$cache/archive-key.gpg"
         if [[ "$(id -u)" == "0" ]]; then
-            wget https://git.devuan.org/devuan/devuan-keyring/raw/branch/master/keyrings/devuan-archive-keyring.gpg -O - --quiet \
+            wget https://files.devuan.org/devuan-archive-keyring.gpg -O - --quiet \
                 | gpg --import --no-default-keyring --keyring="${lreleasekeyring}"
             apt_gpg_opt="--keyring=${lreleasekeyring}"
         else
diff --git a/templates/lxc-kali.in b/templates/lxc-kali.in
index 0a8e6e6..e1db119 100644
--- a/templates/lxc-kali.in
+++ b/templates/lxc-kali.in
@@ -43,7 +43,7 @@ LOCALSTATEDIR="@LOCALSTATEDIR@"
 LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
 # Allows the lxc-cache directory to be set by environment variable
 LXC_CACHE_PATH=${LXC_CACHE_PATH:-"$LOCALSTATEDIR/cache/lxc"}
-[ -z "$DOWNLOAD_KEYRING" ] && DOWNLOAD_KEYRING=1
+DOWNLOAD_KEYRING=${DOWNLOAD_KEYRING:-1}
 
 find_interpreter()
 {