diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh
index 93dbedb..d5f562e 100644
--- a/bootstrap.d/15-rpi-config.sh
+++ b/bootstrap.d/15-rpi-config.sh
@@ -179,7 +179,7 @@ if [ "$ENABLE_SYSTEMDSWAP" = true ] ; then
   temp_dir=$(as_nobody mktemp -d)
 
   # Fetch systemd-swap sources
-  as_nobody git -C "${temp_dir}" clone "${ZSWAP_URL}"
+  as_nobody git -C "${temp_dir}" clone "${SYSTEMDSWAP_URL}"
 
   # Copy downloaded systemd-swap sources
   mv "${temp_dir}/systemd-swap" "${R}/tmp/"
diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index 79bcd3a..7dca724 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -152,7 +152,7 @@ SSH_ROOT_PUB_KEY=${SSH_ROOT_PUB_KEY:=""}
 SSH_USER_PUB_KEY=${SSH_USER_PUB_KEY:=""}
 
 # Advanced settings
-ENABLE_SYSTEMDSWAP=${ENABLE_MINBASE:=false}
+ENABLE_SYSTEMDSWAP=${ENABLE_SYSTEMDSWAP:=false}
 ENABLE_MINBASE=${ENABLE_MINBASE:=false}
 ENABLE_REDUCE=${ENABLE_REDUCE:=false}
 ENABLE_UBOOT=${ENABLE_UBOOT:=false}