diff --git a/Dockerfile b/Dockerfile
index 118260b..ea70dc5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,12 @@
-# Openhab 1.6.2
+# Openhab 1.7.0
 # * configuration is injected
 #
-FROM ubuntu:14.04
+FROM armv7/armhf-java7
 MAINTAINER Tom Deckers <tom@ducbase.com>
 
-RUN apt-get -y update
+RUN apt-get update
 RUN apt-get -y upgrade
-RUN apt-get -y install unzip supervisor wget
-
-# Download and install Oracle JDK
-# For direct download see: http://stackoverflow.com/questions/10268583/how-to-automate-download-and-installation-of-java-jdk-on-linux
-RUN wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" -O /tmp/jdk-7u79-linux-x64.tar.gz http://download.oracle.com/otn-pub/java/jdk/7u79-b15/jdk-7u79-linux-x64.tar.gz
-RUN tar -zxC /opt -f /tmp/jdk-7u79-linux-x64.tar.gz
-RUN ln -s /opt/jdk1.7.0_79 /opt/jdk7
+RUN apt-get -y install unzip supervisor
 
 ENV OPENHAB_VERSION 1.7.0
 
diff --git a/files/openhab.conf b/files/openhab.conf
index 57c0519..ba4042f 100644
--- a/files/openhab.conf
+++ b/files/openhab.conf
@@ -1,4 +1,4 @@
 [program:openhab]
-command=/opt/jdk7/bin/java -Dosgi.clean=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Djetty.port=8080 -Djetty.port.ssl=8443 -Djetty.home=. -Dlogback.configurationFile=configurations/logback.xml -Dfelix.fileinstall.dir=addons -Djava.library.path=lib -Djava.security.auth.login.config=./etc/login.conf -Dorg.quartz.properties=./etc/quartz.properties -Dequinox.ds.block_timeout=240000 -Dequinox.scr.waitTimeOnBlock=60000 -Dfelix.fileinstall.active.level=4 -Djava.awt.headless=true -jar ./server/plugins/org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar -console 5555
+command=java -Dosgi.clean=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Djetty.port=8080 -Djetty.port.ssl=8443 -Djetty.home=. -Dlogback.configurationFile=configurations/logback.xml -Dfelix.fileinstall.dir=addons -Djava.library.path=lib -Djava.security.auth.login.config=./etc/login.conf -Dorg.quartz.properties=./etc/quartz.properties -Dequinox.ds.block_timeout=240000 -Dequinox.scr.waitTimeOnBlock=60000 -Dfelix.fileinstall.active.level=4 -Djava.awt.headless=true -jar ./server/plugins/org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar -console 5555
 directory=/opt/openhab
 stopwaitsecs=30