diff --git a/docker/Dockerfile b/docker/Dockerfile
index 325e9f0..210e7b7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -46,8 +46,7 @@ RUN echo "PATH=\$PATH:/usr/games" >> /app/.bashrc
 RUN which aprsd
 RUN aprsd sample-config > /config/aprsd.conf
 
-ADD bin/run.sh /app
-ADD bin/listen.sh /app
+ADD bin/setup.sh /app
 ADD bin/admin.sh /app
 
 # For the web admin interface
diff --git a/docker/Dockerfile-dev b/docker/Dockerfile-dev
index f6a1a1f..04aa66a 100644
--- a/docker/Dockerfile-dev
+++ b/docker/Dockerfile-dev
@@ -46,8 +46,6 @@ RUN which aprsd
 RUN aprsd sample-config > /config/aprsd.conf
 
 ADD bin/setup.sh /app
-ADD bin/run.sh /app
-ADD bin/listen.sh /app
 ADD bin/admin.sh /app
 
 EXPOSE 8000
diff --git a/docker/bin/setup.sh b/docker/bin/setup.sh
index 00d92b3..1e5bdaa 100755
--- a/docker/bin/setup.sh
+++ b/docker/bin/setup.sh
@@ -6,7 +6,7 @@ set -x
 # what command you want to run in the container
 COMMAND="server"
 
-if [ ! -z "$@" ]; then
+if [ ! -z "${@+x}" ]; then
   COMMAND=$@
 fi