diff --git a/apply-templates.sh b/apply-templates.sh
index bd72b0c..3d1091c 100755
--- a/apply-templates.sh
+++ b/apply-templates.sh
@@ -32,9 +32,12 @@ generated_warning() {
 for version; do
 	export version
 
-	if jq -e '.[env.version] | not' versions.json > /dev/null; then
-		echo "deleting $version ..."
+	if [ -d "$version" ]; then
 		rm -rf "$version"
+	fi
+
+	if jq -e '.[env.version] | not' versions.json > /dev/null; then
+		echo "skipping $version ..."
 		continue
 	fi
 
@@ -43,6 +46,8 @@ for version; do
 
 		echo "processing $version/$variant ..."
 
+		mkdir -p "$version/$variant"
+
 		{
 			generated_warning
 			gawk -f "$jqt" "Dockerfile-$variant.template"
@@ -56,6 +61,8 @@ for version; do
 
 		echo "processing $version/$variant/management ..."
 
+		mkdir -p "$version/$variant/management"
+
 		{
 			generated_warning
 			gawk -f "$jqt" Dockerfile-management.template