diff --git a/README.MD b/README.MD
index 3290fbee4..238f9231f 100644
--- a/README.MD
+++ b/README.MD
@@ -104,7 +104,7 @@ server.address=x.x.x.x
 
 # Vagrant
 
-We supply a complete development environment using Vagrant, to run WebGoat with Vagrant you must first have Vagrant and Virtualbox installed.
+We supply a complete environment using Vagrant, to run WebGoat with Vagrant you must first have Vagrant and Virtualbox installed.
 
 ```shell
    $ cd WebGoat/webgoat-images/vagrant-training
@@ -112,7 +112,7 @@ We supply a complete development environment using Vagrant, to run WebGoat with
 ```
 
 Once the provisioning is complete login to the Virtualbox with username vagrant and password vagrant.
-The source code will be available in the home directory.
+WebGoat and WebWolf will automatically start when you login to this image.
 
 
 # Building a new Docker image
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
index f65bea120..d94544473 100644
--- a/docker-compose-local.yml
+++ b/docker-compose-local.yml
@@ -3,16 +3,11 @@ version: '2.1'
 services:
   webgoat:
     image: webgoat/webgoat-v8.0.0.snapshot
-    environment:
-      - WEBWOLF_HOST=webwolf
-      - WEBWOLF_PORT=9090
-    ports:
-      - "8080:8080"
-    volumes:
-      - .:/home/webgoat/.webgoat
-  command: "java -Djava.security.egd=file:/dev/./urandom -jar /home/webgoat/webgoat.jar --server.address=0.0.0.0 --server.port=8080"
+    extends:
+      file: docker-compose.yml
+      service: webgoat
   webwolf:
-    image: webgoat/webwolf-v8.0.0.snapshot
-    ports:
-      - "9090:9090"
-    command: bash -c "sleep 8 && java -Djava.security.egd=file:/dev/./urandom -jar /home/webwolf/webwolf.jar --server.port=9090 --server.address=0.0.0.0 --spring.datasource.url=jdbc:hsqldb:hsql://webgoat:9001/webgoat"
+    extends:
+      file: docker-compose.yml
+      service: webwolf
+    image: webgoat/webwolf-v8.0.0.snapshot
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index a4e888edb..27262211d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,9 +10,9 @@ services:
       - "8080:8080"
     volumes:
       - .:/home/webgoat/.webgoat
-    command: "java -Djava.security.egd=file:/dev/./urandom -jar /home/webgoat/webgoat.jar --server.address=0.0.0.0"
+    command: "java -Djava.security.egd=file:/dev/./urandom -jar /home/webgoat/webgoat.jar --server.port=8080 --server.address=0.0.0.0"
   webwolf:
     image: webgoat/webwolf
     ports:
       - "9090:9090"
-    command: bash -c "sleep 8 && java -Djava.security.egd=file:/dev/./urandom -jar /home/webwolf/webwolf.jar --server.port=9090 --server.address=0.0.0.0 --spring.datasource.url=jdbc:hsqldb:hsql://webgoat_db:9001/webgoat"
+    command: bash -c "sleep 8 && java -Djava.security.egd=file:/dev/./urandom -jar /home/webwolf/webwolf.jar --server.port=9090 --server.address=0.0.0.0 --spring.datasource.url=jdbc:hsqldb:hsql://webgoat:9001/webgoat"