diff --git a/configs/hp01.config b/configs/hp01.config
index 626ebe7..91317ef 100644
--- a/configs/hp01.config
+++ b/configs/hp01.config
@@ -8,6 +8,11 @@ external_ip=192.168.1.200
 
 compute="hp1-maas-node"
 
+juju_count=0
+control_count=0
+
+enable_tagging=false
+
 bridges=()
 bridges+=("br0")
 bridges+=("br1")
diff --git a/configs/rpi4-maas.config b/configs/rpi4-maas.config
index 0a1b1ce..66d94fe 100644
--- a/configs/rpi4-maas.config
+++ b/configs/rpi4-maas.config
@@ -12,6 +12,8 @@ maas_system_ip="192.168.1.22"
 maas_upstream_dns="192.168.1.13"
 maas_user="admin"
 maas_version="2.9"
+#no_proxy="localhost,127.0.0.1,$maas_system_ip"
+#squid_proxy="http://192.168.1.23:3128"
 maas_pkg_type="snap"
 maas_api_key="BLeLFyaDHeEHMfVzpB:HK9E2XkwUud8T2FFPz:3SxCCMrdRXAENnKqPrK7AXg6NjgtM8w6"
 maas_subnet_start="10.0.1.1"
diff --git a/functions.sh b/functions.sh
index befcd36..4212c5f 100644
--- a/functions.sh
+++ b/functions.sh
@@ -48,6 +48,8 @@ machine_add_tag()
     system_id=$1
     tag=$2
 
+    [[ -n "$enable_tagging" ]] && [[ $enable_tagging == "false" ]] && return
+
     # If the tag doesn't exist, then create it
     if [[ $(maas ${maas_profile} tag read ${tag}) == "Not Found" ]] ; then
         case $tag in
diff --git a/manage-maas-nodes.sh b/manage-maas-nodes.sh
index 8fb4ca3..95b826b 100755
--- a/manage-maas-nodes.sh
+++ b/manage-maas-nodes.sh
@@ -309,10 +309,10 @@ build_vms() {
         # For testing and WIP/POC
         if [[ ${enable_secureboot} == "true" ]] ; then
             extra_args+=" --boot loader_secure=yes"
-            #extra_args+=" --boot loader=/usr/share/OVMF/OVMF_CODE.secboot.fd"
-            #extra_args+=" --boot nvram_template=/usr/share/OVMF/OVMF_VARS.fd"
-            #extra_args+=" --boot loader_ro=yes"
-            #extra_args+=" --boot loader_type=pflash"
+            #extra_args+=",loader=/usr/share/OVMF/OVMF_CODE.secboot.fd"
+            #extra_args+=",nvram_template=/usr/share/OVMF/OVMF_VARS.fd"
+            #extra_args+=",loader_ro=yes"
+            #extra_args+=",loader_type=pflash"
             extra_args+=" --machine q35"
             extra_args+=" --features smm=on"
             enable_uefi="true"
@@ -422,6 +422,8 @@ while getopts ":cwjdnr" opt; do
         wipe_vms
         ;;
     d)
+        install_deps
+        maas_login
         wipe_disks
         ;;
     n)