diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
index 13b44830..58f90690 100644
--- a/Dockerfile.amd64
+++ b/Dockerfile.amd64
@@ -8,8 +8,8 @@ RUN apt-get -q update \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/
 
-# Copy supervisord launch file for resin-supervisor
-COPY resin-supervisor.conf /etc/supervisor/conf.d/resin-supervisor.conf
+# Copy supervisord configuration files
+COPY assets/etc/supervisor/ /etc/supervisor/
 
 # Install dependencies
 WORKDIR /app
diff --git a/Dockerfile.armv7hf b/Dockerfile.armv7hf
index ce5311f5..63f0f7e7 100644
--- a/Dockerfile.armv7hf
+++ b/Dockerfile.armv7hf
@@ -8,8 +8,8 @@ RUN apt-get -q update \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/
 
-# Copy supervisord launch file for resin-supervisor
-COPY resin-supervisor.conf /etc/supervisor/conf.d/resin-supervisor.conf
+# Copy supervisord configuration files
+COPY assets/etc/supervisor/ /etc/supervisor/
 
 # Install dependencies
 WORKDIR /app
diff --git a/Dockerfile.i386 b/Dockerfile.i386
index 2437fddf..87cf8443 100644
--- a/Dockerfile.i386
+++ b/Dockerfile.i386
@@ -8,8 +8,8 @@ RUN apt-get -q update \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/
 
-# Copy supervisord launch file for resin-supervisor
-COPY resin-supervisor.conf /etc/supervisor/conf.d/resin-supervisor.conf
+# Copy supervisord configuration files
+COPY assets/etc/supervisor/ /etc/supervisor/
 
 # Install dependencies
 WORKDIR /app
diff --git a/Dockerfile.rpi b/Dockerfile.rpi
index 5909565b..9eaa5fe9 100644
--- a/Dockerfile.rpi
+++ b/Dockerfile.rpi
@@ -8,8 +8,8 @@ RUN apt-get -q update \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/
 
-# Copy supervisord launch file for resin-supervisor
-COPY resin-supervisor.conf /etc/supervisor/conf.d/resin-supervisor.conf
+# Copy supervisord configuration files
+COPY assets/etc/supervisor/ /etc/supervisor/
 
 # Install dependencies
 WORKDIR /app
diff --git a/resin-supervisor.conf b/assets/etc/supervisor/conf.d/resin-supervisor.conf
similarity index 100%
rename from resin-supervisor.conf
rename to assets/etc/supervisor/conf.d/resin-supervisor.conf
diff --git a/assets/etc/supervisor/supervisord.conf b/assets/etc/supervisor/supervisord.conf
new file mode 100644
index 00000000..b7976932
--- /dev/null
+++ b/assets/etc/supervisor/supervisord.conf
@@ -0,0 +1,28 @@
+; supervisor config file
+
+[unix_http_server]
+file=/var/run/resin/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/resin/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+
+; the below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/resin/supervisor.sock ; use a unix:// URL  for a unix socket
+
+; The [include] section can just contain the "files" setting.  This
+; setting can list multiple files (separated by whitespace or
+; newlines).  It can also contain wildcards.  The filenames are
+; interpreted as relative to this file.  Included files *cannot*
+; include files themselves.
+
+[include]
+files = /etc/supervisor/conf.d/*.conf
diff --git a/entry.sh b/entry.sh
index 2bccc39c..448be331 100755
--- a/entry.sh
+++ b/entry.sh
@@ -16,6 +16,8 @@ if [ -d "$DATA_DIRECTORY" ]; then
 fi
 
 mkdir -p /var/log/supervisor && touch /var/log/supervisor/supervisord.log
+mkdir -p /var/run/resin
+mount -t tmpfs -o size=1m tmpfs /var/run/resin
 
 /usr/bin/supervisord -c /etc/supervisor/supervisord.conf