diff --git a/Dockerfile b/Dockerfile
index b4576c6..f2d368e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 
 # Pull base image
-FROM resin/rpi-raspbian:wheezy
+FROM phusion/baseimage-pi:0.9.16
+
 MAINTAINER Dieter Reuter <dieter@hypriot.com>
 
 # Install Node.js (from tarball)
diff --git a/Makefile b/Makefile
index 2e67187..f5cfc38 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all build push test version
 
 DOCKER_IMAGE_VERSION=0.10.36
-DOCKER_IMAGE_NAME=hypriot/rpi-node
+DOCKER_IMAGE_NAME=aiko/rpi-node
 DOCKER_IMAGE_TAGNAME=$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_VERSION)
 
 all: build