diff --git a/netdata/Dockerfile b/netdata/Dockerfile
index 3f26618..2ab109b 100644
--- a/netdata/Dockerfile
+++ b/netdata/Dockerfile
@@ -3,7 +3,7 @@
 #
 
 FROM alpine
-MAINTAINER kev <noreply@easypi.pro>
+MAINTAINER EasyPi Software Foundation
 
 ENV NETDATA_VERSION 1.6.0
 
@@ -13,28 +13,32 @@ RUN set -xe \
                           bash \
                           build-base \
                           curl \
+                          nodejs \
+                          python \
                           libmnl \
                           libmnl-dev \
                           libuuid \
                           util-linux-dev \
+                          zlib \
                           zlib-dev \
     && addgroup -g 1000 netdata \
     && adduser -D -H -u 1000 -G netdata netdata \
     && curl -sSL https://github.com/firehol/netdata/releases/download/v$NETDATA_VERSION/netdata-$NETDATA_VERSION.tar.gz | tar xz \
     && cd netdata-$NETDATA_VERSION \
-    && ./netdata-installer.sh --dont-wait \
+    && ./netdata-installer.sh --dont-start-it --dont-wait \
     && cd .. \
     && rm -rf netdata-$NETDATA_VERSION \
     && apk del autoconf \
                automake \
                build-base \
-               curl \
                libmnl-dev \
                util-linux-dev \
                zlib-dev
 
 VOLUME /etc/netdata
 
+USER netdata
+
 EXPOSE 19999
 
 CMD ["netdata", "-D"]
diff --git a/netdata/arm/Dockerfile b/netdata/arm/Dockerfile
index c295195..4a7aa4c 100644
--- a/netdata/arm/Dockerfile
+++ b/netdata/arm/Dockerfile
@@ -13,28 +13,32 @@ RUN set -xe \
                           bash \
                           build-base \
                           curl \
+                          nodejs \
+                          python \
                           libmnl \
                           libmnl-dev \
                           libuuid \
                           util-linux-dev \
+                          zlib \
                           zlib-dev \
     && addgroup -g 1000 netdata \
     && adduser -D -H -u 1000 -G netdata netdata \
     && curl -sSL https://github.com/firehol/netdata/releases/download/v$NETDATA_VERSION/netdata-$NETDATA_VERSION.tar.gz | tar xz \
     && cd netdata-$NETDATA_VERSION \
-    && ./netdata-installer.sh --dont-wait \
+    && ./netdata-installer.sh --dont-start-it --dont-wait \
     && cd .. \
     && rm -rf netdata-$NETDATA_VERSION \
     && apk del autoconf \
                automake \
                build-base \
-               curl \
                libmnl-dev \
                util-linux-dev \
                zlib-dev
 
 VOLUME /etc/netdata
 
+USER netdata
+
 EXPOSE 19999
 
 CMD ["netdata", "-D"]
diff --git a/netdata/arm/Dockerfile.debian b/netdata/arm/Dockerfile.debian
new file mode 100644
index 0000000..72364e3
--- /dev/null
+++ b/netdata/arm/Dockerfile.debian
@@ -0,0 +1,52 @@
+#
+# Dockerfile for netdata-arm:debian
+#
+
+FROM resin/rpi-raspbian:jessie
+MAINTAINER EasyPi Software Foundation
+
+ENV NETDATA_VER 1.6.0
+ENV NETDATA_URL https://github.com/firehol/netdata/releases/download/v${NETDATA_VER}/netdata-${NETDATA_VER}.tar.gz
+ENV NETDATA_DEB netdata_${NETDATA_VER}_armhf.deb
+
+WORKDIR /usr/src
+
+RUN set -xe \
+    && apt-get update \
+    && apt-get -y install autoconf \
+                          autoconf-archive \
+                          autogen \
+                          automake \
+                          build-essential \
+                          curl \
+                          debhelper \
+                          dh-autoreconf \
+                          dh-systemd \
+                          fakeroot \
+                          libmnl-dev \
+                          pkg-config \
+                          uuid-dev \
+                          zlib1g-dev \
+    && curl -sSL ${NETDATA_URL} | tar xz \
+    && cd netdata-${NETDATA_VER} \
+    && ln -s contrib/debian \
+    && dpkg-buildpackage -us -uc -rfakeroot \
+    && cd .. \
+    && dpkg -i ${NETDATA_DEB} \
+    && apt-get remove -y autoconf \
+                         autoconf-archive \
+                         autogen \
+                         automake \
+                         build-essential \
+                         curl \
+                         debhelper \
+                         dh-autoreconf \
+                         dh-systemd \
+                         pkg-config \
+    && rm -rf netdata-${NETDATA_VER} /var/lib/apt/lists/*
+
+VOLUME /etc/netdata
+
+EXPOSE 19999
+
+CMD ["netdata", "-D"]