diff --git a/.travis.yml b/.travis.yml
index 12627a632e..901dee8186 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,9 +20,9 @@ before_install:
 
 install:
   # Start up DSpace 7 using the entities database dump
-  - docker-compose -f docker-compose-travis.yml up -d
+  - docker-compose -f ./docker/docker-compose-travis.yml up -d
   # Use the dspace-cli image to populate the assetstore.  Trigger a discovery and oai update
-  - docker-compose -f ./to_be_determined/cli.yml -f ./to_be_determined/cli.assetstore.yml run --rm dspace-cli
+  - docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
   - travis_retry yarn install
 
 before_script:
@@ -31,7 +31,7 @@ before_script:
   #- curl http://localhost:8080/
 
 after_script:
-  - docker-compose -f docker-compose-travis.yml down
+  - docker-compose -f ./docker/docker-compose-travis.yml down
 
 addons:
   apt:
diff --git a/docker-compose.yml b/docker-compose.yml
index 5af000ee68..95cc98c4ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,4 +27,4 @@ services:
     stdin_open: true
     tty: true
     volumes:
-    - ./to_be_determined/environment.dev.js:/app/config/environment.dev.js
+    - ./docker/environment.dev.js:/app/config/environment.dev.js
diff --git a/to_be_determined/cli.assetstore.yml b/docker/cli.assetstore.yml
similarity index 100%
rename from to_be_determined/cli.assetstore.yml
rename to docker/cli.assetstore.yml
diff --git a/to_be_determined/cli.yml b/docker/cli.yml
similarity index 100%
rename from to_be_determined/cli.yml
rename to docker/cli.yml
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
new file mode 100644
index 0000000000..051a82a382
--- /dev/null
+++ b/docker/docker-compose-rest.yml
@@ -0,0 +1,50 @@
+networks:
+  dspacenet: {}
+services:
+  dspace:
+    container_name: dspace
+    depends_on:
+    - dspacedb
+    image: dspace/dspace:dspace-7_x-jdk8-test
+    networks:
+      dspacenet: {}
+    ports:
+    - published: 8080
+      target: 8080
+    stdin_open: true
+    tty: true
+    volumes:
+    - assetstore:/dspace/assetstore
+    - ./local.cfg:/dspace/config/local.cfg
+  dspacedb:
+    container_name: dspacedb
+    image: dspace/dspace-postgres-pgcrypto
+    networks:
+      dspacenet: {}
+    stdin_open: true
+    tty: true
+    volumes:
+    - pgdata:/pgdata
+  dspacesolr:
+    container_name: dspacesolr
+    image: dspace/dspace-solr
+    networks:
+      dspacenet: {}
+    ports:
+    - published: 8983
+      target: 8983
+    stdin_open: true
+    tty: true
+    volumes:
+    - solr_authority:/opt/solr/server/solr/authority/data
+    - solr_oai:/opt/solr/server/solr/oai/data
+    - solr_search:/opt/solr/server/solr/search/data
+    - solr_statistics:/opt/solr/server/solr/statistics/data
+version: '3.7'
+volumes:
+  assetstore: {}
+  pgdata: {}
+  solr_authority: {}
+  solr_oai: {}
+  solr_search: {}
+  solr_statistics: {}
diff --git a/docker-compose-travis.yml b/docker/docker-compose-travis.yml
similarity index 95%
rename from docker-compose-travis.yml
rename to docker/docker-compose-travis.yml
index de1278d90d..652043c7ae 100644
--- a/docker-compose-travis.yml
+++ b/docker/docker-compose-travis.yml
@@ -15,7 +15,7 @@ services:
     tty: true
     volumes:
     - assetstore:/dspace/assetstore
-    - ./to_be_determined/local.cfg:/dspace/config/local.cfg
+    - ./local.cfg:/dspace/config/local.cfg
   dspacedb:
     container_name: dspacedb
     environment:
diff --git a/to_be_determined/environment.dev.js b/docker/environment.dev.js
similarity index 100%
rename from to_be_determined/environment.dev.js
rename to docker/environment.dev.js
diff --git a/to_be_determined/local.cfg b/docker/local.cfg
similarity index 100%
rename from to_be_determined/local.cfg
rename to docker/local.cfg