diff --git a/roles/docker-discourse/handlers/main.yml b/roles/docker-discourse/handlers/main.yml
index b9d8cc4e..9f60f0cd 100644
--- a/roles/docker-discourse/handlers/main.yml
+++ b/roles/docker-discourse/handlers/main.yml
@@ -8,5 +8,5 @@
 #    DOCKER_CLIENT_TIMEOUT: 600
 - name: recreate discourse
   command:
-    cmd: ./launcher rebuild app
+    cmd: ./launcher rebuild discourse_application
     chdir: "{{docker_compose_instance_directory}}"
diff --git a/roles/docker-discourse/tasks/main.yml b/roles/docker-discourse/tasks/main.yml
index e0081785..ed236564 100644
--- a/roles/docker-discourse/tasks/main.yml
+++ b/roles/docker-discourse/tasks/main.yml
@@ -45,8 +45,8 @@
     mode: '700'
     state: directory
 
-- name: "copy configuration {{docker_compose_instance_directory}}containers/app.yml"
+- name: "copy configuration to {{docker_compose_instance_directory}}containers/discourse_application.yml"
   template: 
-    src: app.yml.j2
-    dest: "{{docker_compose_instance_directory}}containers/app.yml"
+    src: discourse_application.yml.j2
+    dest: "{{docker_compose_instance_directory}}containers/discourse_application.yml"
   notify: recreate discourse
\ No newline at end of file
diff --git a/roles/docker-discourse/templates/app.yml.j2 b/roles/docker-discourse/templates/discourse_application.yml.j2
similarity index 97%
rename from roles/docker-discourse/templates/app.yml.j2
rename to roles/docker-discourse/templates/discourse_application.yml.j2
index 7a97751d..a9673236 100644
--- a/roles/docker-discourse/templates/app.yml.j2
+++ b/roles/docker-discourse/templates/discourse_application.yml.j2
@@ -1,7 +1,7 @@
 ## this is the all-in-one, standalone Discourse Docker container template
 ##
 ## After making changes to this file, you MUST rebuild
-## /var/discourse/launcher rebuild app
+## /var/discourse/launcher rebuild discourse_application
 ##
 ## BE *VERY* CAREFUL WHEN EDITING!
 ## YAML FILES ARE SUPER SUPER SENSITIVE TO MISTAKES IN WHITESPACE OR ALIGNMENT!
@@ -50,7 +50,7 @@ env:
 
   ## TODO: The domain name this Discourse instance will respond to
   ## Required. Discourse will not work with a bare IP number.
-  DISCOURSE_HOSTNAME: localhost
+  DISCOURSE_HOSTNAME: {{domain}}
 
   ## Uncomment if you want the container to be started with the same
   ## hostname (-h option) as specified above (default "$hostname-$config")
@@ -85,7 +85,7 @@ env:
 ## The Docker container is stateless; all data is stored in /shared
 volumes:
   - volume:
-      host: /var/discourse/shared/standalone
+      host: discourse_application_data
       guest: /shared
   - volume:
       host: /var/discourse/shared/standalone/log/var-log