diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index c26c5ee..3c72a9a 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -13,12 +13,7 @@ ADD . /opt/openwebrx
 
 WORKDIR /opt/openwebrx
 
-RUN mkdir -p /tmp/openwebrx && \
-    mv "/opt/openwebrx/config_webrx.py" "/opt/openwebrx/config_webrx.py.orig" && \
-    sed 's/temporary_directory = "\/tmp"/temporary_directory = "\/tmp\/openwebrx"/' < "/opt/openwebrx/config_webrx.py.orig" > "/opt/openwebrx/config_webrx.py" && \
-    rm "/opt/openwebrx/config_webrx.py.orig"
-
-VOLUME /config
+VOLUME /etc/openwebrx
 
 ENTRYPOINT [ "/opt/openwebrx/docker/scripts/run.sh" ]
 EXPOSE 8073
diff --git a/docker/scripts/run.sh b/docker/scripts/run.sh
index 20ded90..5ae7d82 100755
--- a/docker/scripts/run.sh
+++ b/docker/scripts/run.sh
@@ -1,10 +1,19 @@
 #!/bin/bash
 set -euo pipefail
 
+mkdir -p /etc/openwebrx/
+mkdir -p /tmp/openwebrx/
 if [[ ! -f /etc/openwebrx/config_webrx.py ]] ; then
-  mkdir -p /etc/openwebrx/
-  cp config_webrx.py /etc/openwebrx/
+  sed 's/temporary_directory = "\/tmp"/temporary_directory = "\/tmp\/openwebrx"/' < "/opt/openwebrx/config_webrx.py" > "/etc/openwebrx/config_webrx.py"
 fi
+if [[ ! -f /etc/openwebrx/bands.json ]] ; then
+  cp bands.json /etc/openwebrx/
+fi
+if [[ ! -f /etc/openwebrx/bookmarks.json ]] ; then
+  cp bookmarks.json /etc/openwebrx/
+fi
+
+
 _term() {
   echo "Caught signal!" 
   kill -TERM "$child" 2>/dev/null