diff --git a/base/up b/base/up
index a8bafb5..4ed37df 100755
--- a/base/up
+++ b/base/up
@@ -1,11 +1,13 @@
-## Docker build
-# eg, ARCHPKG=openssh
-# eg, BUILDTAG=base
+#!/usr/bin/env bash
+# Docker build
+# Optional buildtag, addpkg
+# addpkg=openssh \
 
 ## Fetch latest mirrorlist
 curl --fail --silent https://myvelabs.com/lab/archlinux/raw/branch/master/mirrorlist -o mirrorlist
 
-DOCKER_BUILDKIT=1 docker build ./. \
-    --build-arg pkg=${ARCHPKG:-""} \
-    --tag myvnc/${BUILDTAG:-base} \
-    && rm -f Dockerfile *.sh mirrorlist
+DOCKER_BUILDKIT=1 \
+docker build . \
+    --build-arg addpkg=${addpkg:-""} \
+    --build-arg debug=${debug:-""} \
+    --tag ${buildtag:-myvnc/arch/base}
\ No newline at end of file