diff --git a/desu.local/dns-unbound/build-and-push.sh b/desu.local/build-and-push.sh
similarity index 84%
rename from desu.local/dns-unbound/build-and-push.sh
rename to desu.local/build-and-push.sh
index 85e0faf..74e1c8d 100755
--- a/desu.local/dns-unbound/build-and-push.sh
+++ b/desu.local/build-and-push.sh
@@ -1,3 +1,3 @@
 #! /bin/sh
-project="unbound-desu-local"
+project="$(basename -- "$PWD")"
 docker build --platform linux/arm,linux/arm64,linux/amd64 . -t "rehashedsalt/$project:latest" -t "rehashedsalt/$project:$(git rev-parse --short=7 HEAD)" --push
diff --git a/desu.local/frontend-proxy-picluster/Dockerfile b/desu.local/frontend/Dockerfile
similarity index 100%
rename from desu.local/frontend-proxy-picluster/Dockerfile
rename to desu.local/frontend/Dockerfile
diff --git a/desu.local/frontend-proxy-picluster/httpd.conf b/desu.local/frontend/httpd.conf
similarity index 100%
rename from desu.local/frontend-proxy-picluster/httpd.conf
rename to desu.local/frontend/httpd.conf
diff --git a/desu.local/frontend-proxy-picluster/vhost.conf b/desu.local/frontend/vhost.conf
similarity index 100%
rename from desu.local/frontend-proxy-picluster/vhost.conf
rename to desu.local/frontend/vhost.conf
diff --git a/desu.local/dns-pihole/Dockerfile b/desu.local/pihole/Dockerfile
similarity index 100%
rename from desu.local/dns-pihole/Dockerfile
rename to desu.local/pihole/Dockerfile
diff --git a/desu.local/dns-pihole/custom.list b/desu.local/pihole/custom.list
similarity index 100%
rename from desu.local/dns-pihole/custom.list
rename to desu.local/pihole/custom.list
diff --git a/desu.local/dns-unbound/Dockerfile b/desu.local/unbound-desu-local/Dockerfile
similarity index 100%
rename from desu.local/dns-unbound/Dockerfile
rename to desu.local/unbound-desu-local/Dockerfile
diff --git a/desu.local/dns-unbound/unbound.conf b/desu.local/unbound-desu-local/unbound.conf
similarity index 100%
rename from desu.local/dns-unbound/unbound.conf
rename to desu.local/unbound-desu-local/unbound.conf