diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c38fa4e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea
+*.iml
diff --git a/Dockerfile b/Dockerfile
index 6374674..0653bdf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,18 @@
 
 # Pull base image
-FROM aiko/baseimage-pi:0.9.16
+FROM aiko/baseimage-pi:0.9.18
 
 MAINTAINER Aiko Mastboom <docker@aiko.sh>
 #MAINTAINER Dieter Reuter <dieter@hypriot.com>
 
 # Install Node.js (from tarball)
-ENV NODE_VERSION 0.10.36
+ARG NODE_VERSION=4.4.3
 ADD http://assets.hypriot.com/node-v${NODE_VERSION}-linux-armv6hf.tar.gz /
-RUN \
-  cd /usr/local/ && \
-  tar --strip-components 1 -xzf /node-v${NODE_VERSION}-linux-armv6hf.tar.gz && \
-  rm -f node-v${NODE_VERSION}-linux-armv6hf.tar.gz
+
+RUN /bin/true \
+&&  cd /usr/local/ \
+&&  tar --strip-components 1 -xzf /node-v${NODE_VERSION}-linux-armv6hf.tar.gz \
+&&  rm -f /node-v${NODE_VERSION}-linux-armv6hf.tar.gz
 
 # Define working directory
 WORKDIR /data
diff --git a/Makefile b/Makefile
index 23095df..e207aa9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DOCKER_IMAGE_VERSION=0.10.36
+DOCKER_IMAGE_VERSION=4.4.3
 DOCKER_IMAGE_NAME=aiko/rpi-node
 DOCKER_IMAGE_TAGNAME=$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_VERSION)