diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7333b4..038afa8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -243,10 +243,11 @@ release:
         curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file output/${group}.tar.zst ${PACKAGE_REGISTRY_URL}/${group}-${BUILD_VERSION}.tar.zst
         echo "Uploading ${group}.tar.zst.SHA256"
         curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file output/${group}.tar.zst.SHA256 ${PACKAGE_REGISTRY_URL}/${group}-${BUILD_VERSION}.tar.zst.SHA256
-        sed "/TEMPLATE_ROOTFS_FILE/d" Dockerfile.template > output/Dockerfile.${group}
+        sed "/COPY TEMPLATE_ROOTFS_FILE/d" Dockerfile.template > output/Dockerfile.${group}
+        sed -i "s|TEMPLATE_ROOTFS_FILE|${group}.tar.zst|" output/Dockerfile.${group}
         package_url=$(./ci/get-public-download-for-generic-package.sh ${group}-${BUILD_VERSION}.tar.zst)
         sed -i "s|TEMPLATE_ROOTFS_RELEASE_URL|https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v${BUILD_VERSION}|" output/Dockerfile.${group}
-        sed -i "s|TEMPLATE_ROOTFS_DOWNLOAD|ROOTFS=\"\$(curl -sOJL -w \"%{filename_effective}\" \"${package_url}\")\"|" output/Dockerfile.${group}
+        sed -i "s|TEMPLATE_ROOTFS_DOWNLOAD|curl -sOJL \"${package_url}\"|" output/Dockerfile.${group}
         sed -i "s|TEMPLATE_ROOTFS_HASH|$(cat output/${group}.tar.zst.SHA256)|" output/Dockerfile.${group}
         sed -i "s|TEMPLATE_TITLE|Arch Linux ${group} Image|" output/Dockerfile.${group}
         sed -i "s|TEMPLATE_VERSION_ID|${BUILD_VERSION}|" output/Dockerfile.${group}
diff --git a/Dockerfile.template b/Dockerfile.template
index 262015c..507f57b 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -20,7 +20,7 @@ RUN TEMPLATE_ROOTFS_DOWNLOAD && \
     echo "TEMPLATE_ROOTFS_HASH" > /tmp/sha256sums.txt && \
     sha256sum -c /tmp/sha256sums.txt && \
     mkdir /rootfs && \
-    tar -C /rootfs --extract --file "${ROOTFS}"
+    tar -C /rootfs --extract --file TEMPLATE_ROOTFS_FILE
 
 FROM scratch AS root
 
diff --git a/scripts/make-dockerfile.sh b/scripts/make-dockerfile.sh
index 43263e3..782c567 100755
--- a/scripts/make-dockerfile.sh
+++ b/scripts/make-dockerfile.sh
@@ -7,7 +7,7 @@ declare -r OUTPUTDIR="$2"
 
 sed -e "s|TEMPLATE_ROOTFS_FILE|$GROUP.tar.zst|" \
     -e "s|TEMPLATE_ROOTFS_RELEASE_URL|Local build|" \
-    -e "s|TEMPLATE_ROOTFS_DOWNLOAD|ROOTFS=\"$GROUP.tar.zst\"|" \
+    -e "s|TEMPLATE_ROOTFS_DOWNLOAD|true|" \
     -e "s|TEMPLATE_ROOTFS_HASH|$(cat $OUTPUTDIR/$GROUP.tar.zst.SHA256)|" \
     -e "s|TEMPLATE_TITLE|Arch Linux Dev Image|" \
     -e "s|TEMPLATE_VERSION_ID|dev|" \