diff --git a/Dockerfile b/Dockerfile
index 03e169e..709b1c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM jboss/base-jdk:8
 
-ENV KEYCLOAK_VERSION 1.6.1.Final
+ENV KEYCLOAK_VERSION 1.7.0.Final
 
 
 USER root
@@ -9,14 +9,14 @@ RUN mkdir /data && touch /data/keycloak.json && chown jboss:jboss /data/keycloak
 USER jboss
 
 # Download Keycloak and unzip
-RUN cd /opt/jboss/ && curl http://central.maven.org/maven2/org/keycloak/keycloak-server-dist/$KEYCLOAK_VERSION/keycloak-server-dist-$KEYCLOAK_VERSION.tar.gz | tar zx && mv /opt/jboss//keycloak-$KEYCLOAK_VERSION /opt/jboss/keycloak
+RUN cd /opt/jboss/ && curl http://downloads.jboss.org/keycloak/$KEYCLOAK_VERSION/keycloak-$KEYCLOAK_VERSION.tar.gz | tar zx && mv /opt/jboss/keycloak-$KEYCLOAK_VERSION /opt/jboss/keycloak
 
 # switch to standalone-full
 ADD setLogLevel.xsl /opt/jboss/keycloak/
 RUN java -jar /usr/share/java/saxon.jar -s:/opt/jboss/keycloak/standalone/configuration/standalone.xml -xsl:/opt/jboss/keycloak/setLogLevel.xsl -o:/opt/jboss/keycloak/standalone/configuration/standalone.xml
 
 # add admin user
-RUN /opt/jboss/keycloak/bin/add-user.sh admin admin --silent
+RUN /opt/jboss/keycloak/bin/add-user.sh -u admin -p admin
 ENV JBOSS_HOME /opt/jboss/keycloak
 
 # setup postgres database instead of h2
diff --git a/build.sh b/build.sh
index 4cbadd0..e1b91c6 100755
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker build -t keycloak_image:1.6.1.Final .
+docker build -t keycloak_image:1.7.0.Final .
diff --git a/docker-compose.yml b/docker-compose.yml
index c8574b2..2de2004 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ db:
         - POSTGRES_ROOT_PASSWORD=root_password
 
 keycloak:
-    image: keycloak_image:1.6.1.Final
+    image: keycloak_image:1.7.0.Final
     environment:
         - KEYCLOAK_LOGLEVEL=DEBUG
     links: