diff --git a/dev/build b/dev/build
index f3ae34cd..50d9876b 100755
--- a/dev/build
+++ b/dev/build
@@ -20,4 +20,4 @@ fi
 docker build -t neko_server_build --target build --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" -f ../$DOCKERFILE ..
 docker build -t neko_server_runtime --target runtime --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" -f ../$DOCKERFILE ..
 
-docker build -t neko_server_app --build-arg "BASE_IMAGE=neko_server_runtime" -f ./runtime/$DOCKERFILE ./runtime
+docker build -t neko_server_app --build-arg "BASE_IMAGE=neko_server_runtime" -f ./runtime/Dockerfile ./runtime
diff --git a/dev/runtime/Dockerfile b/dev/runtime/Dockerfile
index e1d401b1..0eab10e8 100644
--- a/dev/runtime/Dockerfile
+++ b/dev/runtime/Dockerfile
@@ -1,16 +1,28 @@
 ARG BASE_IMAGE=neko_server_runtime:latest
 FROM $BASE_IMAGE
 
+ARG SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US"
+
 #
-# install xfce
+# install xfce and firefox
 RUN set -eux; apt-get update; \
-    apt-get install -y --no-install-recommends xfce4 xfce4-terminal firefox-esr sudo; \
+    apt-get install -y --no-install-recommends \
+        xfce4 xfce4-terminal sudo \
+        xz-utils bzip2 libgtk-3-0 libdbus-glib-1-2; \
+    #
+    # fetch latest firefox release
+    wget -O /tmp/firefox-setup.tar.bz2 "${SRC_URL}"; \
+    mkdir /usr/lib/firefox; \
+    tar -xjf /tmp/firefox-setup.tar.bz2 -C /usr/lib; \
+    rm -f /tmp/firefox-setup.tar.bz2; \
+    ln -s /usr/lib/firefox/firefox /usr/bin/firefox; \
     #
     # add user to sudoers
     usermod -aG sudo neko; \
     echo "neko:neko" | chpasswd; \
     echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
     # clean up
+    apt-get --purge autoremove -y xz-utils bzip2; \
     apt-get clean -y; \
     rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
diff --git a/dev/runtime/Dockerfile.nvidia b/dev/runtime/Dockerfile.nvidia
deleted file mode 100644
index e01cbc6d..00000000
--- a/dev/runtime/Dockerfile.nvidia
+++ /dev/null
@@ -1,20 +0,0 @@
-ARG BASE_IMAGE=neko_server_runtime:latest
-FROM $BASE_IMAGE
-
-#
-# install xfce
-RUN set -eux; apt-get update; \
-    # nvidia docker does not have firefox only firefox-esr
-    apt-get install -y --no-install-recommends xfce4 xfce4-terminal firefox sudo; \
-    #
-    # add user to sudoers
-    usermod -aG sudo neko; \
-    echo "neko:neko" | chpasswd; \
-    echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# copy configuation files
-COPY supervisord.conf /etc/neko/supervisord/xfce.conf
diff --git a/dev/start b/dev/start
index ad65b3cd..514bd2f2 100755
--- a/dev/start
+++ b/dev/start
@@ -55,5 +55,6 @@ docker run --rm -it \
     -v "${PWD}/runtime/$CONFIG:/etc/neko/neko.yml" \
     -e "NEKO_DEBUG=1" \
     --shm-size=2G \
+    --security-opt seccomp=unconfined \
     $EXTRAOPTS \
     neko_server_app:latest;