diff --git a/alpine/gitea/build.sh b/alpine/gitea/build.sh
index 3c27ae3..5ca6457 100755
--- a/alpine/gitea/build.sh
+++ b/alpine/gitea/build.sh
@@ -2,37 +2,38 @@
 
 set -e
 
-[ -z $ROOTFS         ] && ROOTFS=/tmp/gitea
+NAME=gitea
+IMAGE=/tmp/$NAME.raw
+
+[ -z $ROOTFS         ] && ROOTFS=$(mktemp -d $NAME.XXX -t)
 [ -z $ALPINE_VERSION ] && ALPINE_VERSION=3.10
 [ -z $ALPINE_RELEASE ] && ALPINE_RELEASE=0
 
 ALPINE_TARBALL=alpine-minirootfs-$ALPINE_VERSION.$ALPINE_RELEASE-x86_64.tar.gz
 
-[ -f $ROOTFS.raw     ] && rm $ROOTFS.raw
+[ -f $NAME.raw     ] && rm $NAME.raw
 [ -f $ALPINE_TARBALL ] || wget http://dl-cdn.alpinelinux.org/alpine/v$ALPINE_VERSION/releases/x86_64/$ALPINE_TARBALL
 
-(sudo systemctl stop gitea.service && sudo portablectl detach gitea) || echo "Image not attached."
+(sudo systemctl stop $NAME.service && sudo portablectl detach $NAME) || echo "Image not attached."
 
-mkdir -p $ROOTFS
 tar xf $ALPINE_TARBALL -C $ROOTFS/
 
 chmod 755 $ROOTFS
 
 mkdir -p \
     $ROOTFS/etc/systemd/system \
-    $ROOTFS/etc/gitea \
-    $ROOTFS/var/lib/gitea \
-    $ROOTFS/run/gitea \
+    $ROOTFS/etc/$NAME \
+    $ROOTFS/var/lib/$NAME \
+    $ROOTFS/run/$NAME \
     $ROOTFS/root/.ssh
 
-touch  $ROOTFS/etc/machine-id $ROOTFS/etc/resolv.conf
+touch $ROOTFS/etc/machine-id $ROOTFS/etc/resolv.conf
+cp systemd/* $ROOTFS/etc/systemd/system/
 
 sudo systemd-nspawn --directory $ROOTFS/ /sbin/apk update
 sudo systemd-nspawn --directory $ROOTFS/ /sbin/apk add --no-cache gitea openssh-keygen
 sudo systemd-nspawn --directory $ROOTFS/ /bin/rm -rf /etc/apk/* /var/cache/*
 
-cp systemd/* $ROOTFS/etc/systemd/system/
-
-rm -f $ROOTFS.raw
-mksquashfs $ROOTFS/ $ROOTFS.raw -all-root -noappend
-sudo portablectl attach $ROOTFS.raw
+mksquashfs $ROOTFS/ $IMAGE -all-root -noappend
+sudo portablectl attach $IMAGE
+sudo systemctl restart $NAME.service