diff --git a/Dockerfile b/Dockerfile
index a95ff4e..1812067 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,23 +7,22 @@ ENV MUMBLE_VERSION 1.2.12
 # Create Mumble directories
 ENV MUMBLE_DIR  /opt/mumble
 ENV CONFIG_DIR  /srv/mumble
-ENV SCRIPTS_DIR /srv/scripts
 RUN mkdir -pv ${MUMBLE_DIR} ${CONFIG_DIR}
 
 # Copy config file
 COPY files/config.ini ${CONFIG_DIR}/config.ini
 
 # Copy SuperUser password update script
-COPY files/update-pw ${SCRIPTS_DIR}/update-pw
-RUN chmod +x ${SCRIPTS_DIR}/update-pw
+COPY files/supw /bin/supw
+RUN chmod +x /bin/supw
 
-# Install dependencies
-RUN apk add --update ca-certificates bzip2 tar wget \
-    && rm -rf /var/cache/apk/*
+# Set the zipball URL
+ENV BZIP_URL https://github.com/mumble-voip/mumble/releases/download/${MUMBLE_VERSION}/murmur-static_x86-${MUMBLE_VERSION}.tar.bz2
 
-# Download and extract Mumble
-RUN wget -qO- https://github.com/mumble-voip/mumble/releases/download/${MUMBLE_VERSION}/murmur-static_x86-${MUMBLE_VERSION}.tar.bz2 \
-    | tar -xjv --strip-components=1 -C ${MUMBLE_DIR}
+# Install dependencies and fetch Mumble bzip archive
+RUN apk add --update ca-certificates bzip2 tar wget \
+    && wget -qO- ${BZIP_URL} | tar -xjv --strip-components=1 -C ${MUMBLE_DIR} \
+    && apk del ca-certificates bzip2 tar wget && rm -rf /var/cache/apk/*
 
 # Expose ports
 EXPOSE 64738 64738/udp
diff --git a/README.md b/README.md
index 9a91a55..3058bca 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Docker container for Mumble server.
 
 First create a data-only container to hold the persistent config data:
 
-    docker run --name mumble-data phlak/mumble echo "Data-only container for Mumble server"
+    docker create --name mumble-data phlak/mumble echo "Data-only container for Mumble server"
 
 Then run the Mumble server:
 
@@ -27,7 +27,7 @@ After starting your container, you can get the randomly generated SuperUser pass
 
 Manually set a new SuperUser password with:
 
-    docker exec -it mumble-server /srv/scripts/update-pw
+    docker exec -it mumble-server supw
 
 **NOTE:** This can be run at any time to update the SuperUser password
 
diff --git a/files/update-pw b/files/supw
similarity index 100%
rename from files/update-pw
rename to files/supw