diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index 222557bc81..6f5a1d6c83 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -5,7 +5,7 @@ services:
     container_name: dspace
     depends_on:
     - dspacedb
-    image: dspace/dspace:dspace-7_x-jdk8-test
+    image: dspace/dspace:dspace-7_x-test
     networks:
       dspacenet:
     ports:
diff --git a/docker/docker-compose-travis.yml b/docker/docker-compose-travis.yml
index 6ca44e4e47..f0f5ef70e8 100644
--- a/docker/docker-compose-travis.yml
+++ b/docker/docker-compose-travis.yml
@@ -5,7 +5,7 @@ services:
     container_name: dspace
     depends_on:
     - dspacedb
-    image: dspace/dspace:dspace-7_x-jdk8-test
+    image: dspace/dspace:dspace-7_x-test
     networks:
       dspacenet:
     ports:
diff --git a/docker/local.cfg b/docker/local.cfg
index 947b3c8248..70bc45c112 100644
--- a/docker/local.cfg
+++ b/docker/local.cfg
@@ -1,6 +1,5 @@
 dspace.dir=/dspace
 db.url=jdbc:postgresql://dspacedb:5432/dspace
-dspace.hostname=dspace
-dspace.baseUrl=http://localhost:8080/server
+dspace.server.url=http://localhost:8080/server
 dspace.name=DSpace Started with Docker Compose
 solr.server=http://dspacesolr:8983/solr