diff --git a/Dockerfile b/Dockerfile
index cef6319..1df4c2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,31 @@
 FROM jlesage/baseimage-gui:ubuntu-18.04
 
 RUN set -x && \
-    apt-get update -y && \
-    echo "========== Japanese font support (github issue #2) ==========" && \
-    apt-get install -y fonts-takao fonts-takao-mincho && \
-    echo "=============================================================" && \
-    apt-get install -y locales software-properties-common && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+        firefox \
+        fonts-takao \
+        fonts-takao-mincho \
+        locales \
+        software-properties-common \
+        && \
     add-apt-repository -y ppa:musicbrainz-developers/stable && \
-    apt-get install -y picard && \
-    echo "#!/bin/sh" >> /startapp.sh && \
-    echo "export HOME=/config" >> /startapp.sh && \
-    echo "/usr/bin/picard -N" >> /startapp.sh && \
-    chmod a+x /startapp.sh && \
+    apt-get update && \
+    apt-get install -y \
+        picard \
+        && \
     locale-gen en_US.UTF-8 && \
     mkdir -p /tmp/run/user/app && \
     chmod 0700 /tmp/run/user/app && \
+    update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/firefox 200 && \
     echo "========== Clean-up ==========" && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*
 
+COPY startapp.sh /startapp.sh
+
 ENV APP_NAME="MusicBrainz Picard" \
     LC_ALL="en_US.UTF-8" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US.UTF-8"
-    
+    
\ No newline at end of file
diff --git a/build_and_push.sh b/build_and_push.sh
index 9fb3b05..00c090d 100755
--- a/build_and_push.sh
+++ b/build_and_push.sh
@@ -1,20 +1,19 @@
-#!/bin/sh
+#!/usr/bin/env sh
+#shellcheck shell=sh
 
-#VERSION=`picard -V | tr -s " " | cut -d " " -f 2 | tr -d ","`
-#ARCH=`uname -m`
-IMAGE=mikenye/picard
+REPO=mikenye
+IMAGE=picard
 
 # Build
-docker image rm ${IMAGE}:builder
+docker image rm ${REPO}/${IMAGE}:builder
 docker image rm jlesage/baseimage-gui:ubuntu-18.04
-docker build -f Dockerfile -t ${IMAGE}:builder .
+docker build -f Dockerfile -t ${REPO}/${IMAGE}:builder .
 
 # Get version
-VERSION=`docker run --rm --entrypoint picard mikenye/picard:builder -V | tail -1 | tr -s " " | cut -d " " -f 2 | tr -d ","`
+VERSION=$(docker run --rm --entrypoint picard ${REPO}/${IMAGE}:builder -V | tail -1 | tr -s " " | cut -d " " -f 2 | tr -d ",")
 
-docker tag ${IMAGE}:builder ${IMAGE}:${VERSION}
-docker tag ${IMAGE}:builder ${IMAGE}:latest
-
-docker push ${IMAGE}:${VERSION}
-docker push ${IMAGE}:latest
+docker tag ${REPO}/${IMAGE}:builder ${REPO}/${IMAGE}:${VERSION}
+docker tag ${REPO}/${IMAGE}:builder ${REPO}/${IMAGE}:latest
 
+docker push ${REPO}/${IMAGE}:${VERSION}
+docker push ${REPO}/${IMAGE}:latest
diff --git a/startapp.sh b/startapp.sh
new file mode 100755
index 0000000..3de5be4
--- /dev/null
+++ b/startapp.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+#shellcheck shell=sh
+
+set -xe
+
+export HOME=/config
+
+# Set default browser
+#firefox -setDefaultBrowser
+#
+#PROFILEDIR=$(cat /config/.mozilla/firefox/profiles.ini | grep Path= | grep .default-release | cut -d "=" -f 2)
+#PROFILEPATH="/config/.mozilla/firefox/${PROFILEDIR}"
+
+/usr/bin/picard -N
\ No newline at end of file