diff --git a/bubble-server/src/main/resources/packer/roles/algo/files/config.cfg.hbs b/bubble-server/src/main/resources/packer/roles/algo/files/config.cfg.hbs
index dcb42982..b3c13db7 100644
--- a/bubble-server/src/main/resources/packer/roles/algo/files/config.cfg.hbs
+++ b/bubble-server/src/main/resources/packer/roles/algo/files/config.cfg.hbs
@@ -127,8 +127,10 @@ wireguard_network_ipv4: 10.19.49.0/24
 wireguard_network_ipv6: fd9d:bc11:4021::/48
 
 # Randomly generated IP address for the local dns resolver
-local_service_ip: "{{ '172.16.0.1' | ipmath(1048573 | random(seed=algo_server_name + ansible_fqdn)) }}"
-local_service_ipv6: "{{ 'fd00::1' | ipmath(1048573 | random(seed=algo_server_name + ansible_fqdn)) }}"
+local_service_ip: "<<rand_ip '172.16.0.0/12' '!domain'>>"
+local_service_ipv6: "<<rand_ip 'fd00::/8' '!domain'>>"
+#local_service_ip: "{{ '172.16.0.1' | ipmath(1048573 | random(seed=algo_server_name + ansible_fqdn)) }}"
+#local_service_ipv6: "{{ 'fd00::1' | ipmath(1048573 | random(seed=algo_server_name + ansible_fqdn)) }}"
 
 
 congrats:
diff --git a/utils/cobbzilla-utils b/utils/cobbzilla-utils
index 622fcee1..51d700f6 160000
--- a/utils/cobbzilla-utils
+++ b/utils/cobbzilla-utils
@@ -1 +1 @@
-Subproject commit 622fcee16099536b72aefc92475463a1e9b28756
+Subproject commit 51d700f6fe634d092adb3f238caf429a2d4c4dc7
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index 5d199cbd..bf9e491c 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit 5d199cbd98656554031faefc8e824d5897186135
+Subproject commit bf9e491c17193a54d5b53b803da82b0e5a828109