diff --git a/Makefile b/Makefile
index 98ce2f9..45c7fda 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ $(CONTAINERS): % : %/${IMAGE_OUTPUT}
 
 %/${BUILD_ID_OUT}: %/Containerfile
 	buildah build \
+		-t $(DOMAIN)/$*:latest \
 		--iidfile $*/${BUILD_ID_OUT} \
 		$*
 
diff --git a/config.mk b/config.mk
index 7489a59..7b51204 100644
--- a/config.mk
+++ b/config.mk
@@ -9,6 +9,6 @@ data/dns/${IMAGE_OUTPUT}: data/dns/% : \
 	data/opendkim/% \
 	data/dns/redxen.eu
 
-software/nsd/${IMAGE_OUTPUT}: software/nsd/% : \
+daemons/nsd/${IMAGE_OUTPUT}: daemons/nsd/% : \
 	data/dns/% \
-	software/nsd/nsd.conf
+	daemons/nsd/nsd.conf
diff --git a/software/nsd/Containerfile b/daemons/nsd/Containerfile
similarity index 100%
rename from software/nsd/Containerfile
rename to daemons/nsd/Containerfile
diff --git a/software/nsd/nsd.conf b/daemons/nsd/nsd.conf
similarity index 100%
rename from software/nsd/nsd.conf
rename to daemons/nsd/nsd.conf