diff --git a/dists/build.sh b/dists/build.sh
index f38c5b2c..4e8ddaa6 100644
--- a/dists/build.sh
+++ b/dists/build.sh
@@ -16,7 +16,7 @@ readonly VERSION
 main() {
     case "$COMMAND" in
     pkg)
-        PKGDEST=. makepkg --syncdeps --force --cleanbuild --noconfirm --noprogressbar
+        PKGDEST="$OUTPUT" makepkg --syncdeps --force --cleanbuild --noconfirm --noprogressbar
         ;;
 
     dpkg)
diff --git a/dists/docker.sh b/dists/docker.sh
index a21f3a81..514f03d6 100644
--- a/dists/docker.sh
+++ b/dists/docker.sh
@@ -56,9 +56,8 @@ build_in_docker_makepkg() {
 	else
 		docker pull "$BASEIMAGE/$dist"
 		docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \
-			--env MAKEFLAGS="-j$(nproc)" --env PACKAGER="$PACKAGER" \
-			--env BUILDDIR=/tmp/build --env PKGDEST="$BUILDIR" \
-			--env DIST="$dist" \
+			--env PKGDEST="$BUILDIR" --env PACKAGER="$PACKAGER" \
+			--env BUILDDIR=/tmp/build \
 			"$BASEIMAGE/$dist"
 	fi
 
@@ -77,7 +76,7 @@ build_in_docker_dpkg() {
 	else
 		docker pull "$BASEIMAGE/$dist"
 		docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \
-			--env DEBIAN_FRONTEND=noninteractive --env DIST="$dist" \
+			--env DEBIAN_FRONTEND=noninteractive --env DISTRIBUTION="$dist" \
 			"$BASEIMAGE/$dist"
 		docker exec "$img" sudo apt-get update -q
         docker exec "$img" sudo apt-get install -y config-package-dev rsync