diff --git a/dnsmasq/bin/dnsmasq-entrypoint b/dnsmasq/bin/dnsmasq-entrypoint
index 2b989bb..242dbec 100644
--- a/dnsmasq/bin/dnsmasq-entrypoint
+++ b/dnsmasq/bin/dnsmasq-entrypoint
@@ -11,17 +11,17 @@ tmp="$(mktemp -d -t cryptic-net-dnsmasq-entrypoint-XXX)"
 
 ( trap "rm -rf '$tmp'" EXIT
 
-    tar xzf "$_BOOTSTRAP_PATH" -C "$tmp" ./nebula/hosts
+    tar xzf "$_BOOTSTRAP_PATH" -C "$tmp" ./hosts
 
     thisHostName=$(tar xzf "$_BOOTSTRAP_PATH" --to-stdout ./hostname)
-    thisHostIP=$(cat "$tmp"/nebula/hosts/"$thisHostName".yml | yq '.ip')
+    thisHostIP=$(cat "$tmp"/hosts/"$thisHostName".yml | yq '.nebula.ip')
 
     echo "listen-address=$thisHostIP" >> "$conf_path"
 
-    ls -1 "$tmp"/nebula/hosts | while read hostYml; do
+    ls -1 "$tmp"/hosts | while read hostYml; do
 
         hostName=$(echo "$hostYml" | cut -d. -f1)
-        hostIP=$(cat "$tmp"/nebula/hosts/"$hostYml" | yq '.ip')
+        hostIP=$(cat "$tmp"/hosts/"$hostYml" | yq '.nebula.ip')
         echo "address=/${hostName}.hosts.cryptic.io/$hostIP" >> "$conf_path"
 
     done
diff --git a/garage/src/bin/garage-apply-layout-diff b/garage/src/bin/garage-apply-layout-diff
index 3a718ad..5375cc9 100644
--- a/garage/src/bin/garage-apply-layout-diff
+++ b/garage/src/bin/garage-apply-layout-diff
@@ -5,10 +5,10 @@ tmp="$(mktemp -d -t cryptic-net-garage-apply-layout-diff-XXX)"
 
 ( trap "rm -rf '$tmp'" EXIT
 
-    tar xzf "$_BOOTSTRAP_PATH" -C "$tmp" ./nebula/hosts
+    tar xzf "$_BOOTSTRAP_PATH" -C "$tmp" ./hosts
 
     thisHostName=$(tar xzf "$_BOOTSTRAP_PATH" --to-stdout ./hostname)
-    thisHostIP=$(cat "$tmp"/nebula/hosts/"$thisHostName".yml | yq '.ip')
+    thisHostIP=$(cat "$tmp"/hosts/"$thisHostName".yml | yq '.nebula.ip')
 
     firstRPCPort=$(cat "$_DAEMON_YML_PATH" | yq '.storage.allocations[0].rpc_port')