diff --git a/.dockerignore b/.dockerignore
index f8074915..aff76b4d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,2 @@
 *
-!docker/
 !/*.tgz
diff --git a/Dockerfile b/Dockerfile
index 4b039897..d6cf64aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,15 +8,11 @@ FROM node:12-alpine
 
 WORKDIR /room-assistant
 
-RUN apk add --no-cache supervisor bluez bluez-deprecated libusb avahi avahi-dev dmidecode \
-    && mkdir -p /var/run/dbus \
+RUN apk add --no-cache bluez bluez-deprecated libusb avahi-dev dmidecode \
     && setcap cap_net_raw+eip $(eval readlink -f `which node`) \
     && setcap cap_net_raw+eip $(eval readlink -f `which hcitool`) \
-    && addgroup --gid 998 i2c \
-    && addgroup node i2c \
     && ln -s /usr/local/lib/node_modules/room-assistant/bin/room-assistant.js /usr/local/bin/room-assistant
-COPY docker/supervisord.conf docker/entrypoint.sh /etc/
 COPY --from=build /usr/local/lib/node_modules/room-assistant /usr/local/lib/node_modules/room-assistant
 
-ENTRYPOINT ["/bin/sh", "-c"]
-CMD ["/etc/entrypoint.sh"]
+ENTRYPOINT ["room-assistant"]
+CMD ["--digResolver"]
diff --git a/dev.Dockerfile b/dev.Dockerfile
index 81b36259..b14cacb8 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -9,15 +9,11 @@ FROM node:12-alpine
 
 WORKDIR /room-assistant
 
-RUN apk add --no-cache supervisor bluez bluez-deprecated libusb avahi avahi-dev dmidecode \
-    && mkdir -p /var/run/dbus \
+RUN apk add --no-cache bluez bluez-deprecated libusb avahi-dev bind-tools dmidecode \
     && setcap cap_net_raw+eip $(eval readlink -f `which node`) \
     && setcap cap_net_raw+eip $(eval readlink -f `which hcitool`) \
-    && addgroup --gid 998 i2c \
-    && addgroup node i2c \
     && ln -s /usr/local/lib/node_modules/room-assistant/bin/room-assistant.js /usr/local/bin/room-assistant
-COPY docker/supervisord.conf docker/entrypoint.sh /etc/
 COPY --from=build /usr/local/lib/node_modules/room-assistant /usr/local/lib/node_modules/room-assistant
 
-ENTRYPOINT ["/bin/sh", "-c"]
-CMD ["/etc/entrypoint.sh"]
+ENTRYPOINT ["room-assistant"]
+CMD ["--digResolver"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
deleted file mode 100755
index acfdd4e7..00000000
--- a/docker/entrypoint.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Starting DBUS daemon..."
-dbus-uuidgen > /var/lib/dbus/machine-id
-dbus-daemon --config-file=/usr/share/dbus-1/system.conf
-
-echo "Starting supervisor..."
-exec supervisord -c /etc/supervisord.conf
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
deleted file mode 100644
index 07f21e36..00000000
--- a/docker/supervisord.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-[supervisord]
-nodaemon=true
-user=root
-
-[program:avahi-daemon]
-command=avahi-daemon
-priority=50
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:room-assistant]
-command=room-assistant
-user=node
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docs/guide/configuration.md b/docs/guide/configuration.md
index 715aaf4a..215e2b7d 100644
--- a/docs/guide/configuration.md
+++ b/docs/guide/configuration.md
@@ -18,6 +18,8 @@ services:
   room-assistant:
     image: mkerix/room-assistant
     network_mode: host
+    volumes:
+      - /var/run/dbus:/var/run/dbus
     environment:
       NODE_CONFIG: >
         {