diff --git a/Dockerfile b/Dockerfile
index 9efb952c..d43346ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/qemu-tools/qemu-host as builder
+FROM qemux/qemu-host as builder
 
 #  FROM golang as builder
 #  WORKDIR /
@@ -21,14 +21,13 @@ RUN apt-get update && apt-get -y upgrade && \
 	unzip \
 	socat \	
 	procps \
-	dnsmasq \
 	xz-utils \
 	iptables \
 	iproute2 \
-	net-tools \
-	btrfs-progs \
-	netcat-openbsd \
+ 	dnsmasq \
+  	net-tools \
 	ca-certificates \
+	netcat-openbsd \
 	qemu-system-x86 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/run/disk.sh b/run/disk.sh
index 165364c7..404835c4 100644
--- a/run/disk.sh
+++ b/run/disk.sh
@@ -125,7 +125,7 @@ if [ ! -f "${DATA}" ]; then
   fi
 
   # Format as BTRFS filesystem
-  mkfs.btrfs -q -L data -d single -m dup "${DATA}" > /dev/null
+  # mkfs.btrfs -q -L data -d single -m dup "${DATA}" > /dev/null
 
 fi
 
diff --git a/run/install.sh b/run/install.sh
index 8bdc8124..f4178a97 100644
--- a/run/install.sh
+++ b/run/install.sh
@@ -31,7 +31,7 @@ rm -f "$STORAGE"/"$BASE".agent
 rm -f "$STORAGE"/"$BASE".boot.img
 rm -f "$STORAGE"/"$BASE".system.img
 
-TMP="$STORAGE/tmp"
+TMP="/tmp/dsm"
 RDC="$STORAGE/dsm.rd"
 
 rm -rf "$TMP" && mkdir -p "$TMP"
@@ -250,6 +250,11 @@ mke2fs -q -t ext4 -b 4096 -d "$MOUNT/" -L "$LABEL" -F -E "offset=$OFFSET" "$SYST
 rm -rf "$MOUNT"
 
 echo "$BASE" > "$STORAGE"/dsm.ver
+
+# Check free diskspace
+SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
+(( 6442450944 > SPACE )) && error "Not enough free space in destination folder." && exit 94
+
 mv -f "$PAT" "$STORAGE"/"$BASE".pat
 mv -f "$BOOT" "$STORAGE"/"$BASE".boot.img
 mv -f "$SYSTEM" "$STORAGE"/"$BASE".system.img