diff --git a/app.json b/app.json
index 6da6a76b5..648d849ae 100644
--- a/app.json
+++ b/app.json
@@ -3,9 +3,7 @@
   "description": "Mass peer to peer texting tool",
   "repository":"https://github.com/moveonorg/spoke",
   "success_url":"/",
-  "buildpacks": [
-      { "url": "https://github.com/heroku/heroku-buildpack-nodejs"}
-  ],
+  "stack": "container",
   "env": {
     "SUPPRESS_SELF_INVITE": {
       "description": "Should anonymous visitors be able to create new organizations from the home page? You will probably want to start the app with this off, and then after creating your own organization, come back here and set it to 1",
@@ -15,26 +13,22 @@
 
     "AUTH0_DOMAIN": {
       "description": "auth0 domain attached to auth0 account",
-      "required": true,
-      "value": "<changeme>.auth0.com"
+      "required": true
     },
 
     "AUTH0_CLIENT_ID": {
       "description": "auth0 client id attached to auth0 account",
-      "required": true,
-      "value": "<changeme>"
+      "required": true
     },
 
     "AUTH0_CLIENT_SECRET": {
       "description": "auth0 client secret attached to auth0 account",
-      "required": true,
-      "value": "<changeme>"
+      "required": true
     },
 
     "BASE_URL": {
-      "description": "based on your herokuapp name or domain name",
-      "required": true,
-      "value": "https://<changeme>.herokuapp.com"
+      "description": "Set this if you are using a custom domain",
+      "required": false
     },
 
     "SESSION_SECRET": {
@@ -51,26 +45,22 @@
 
     "TWILIO_API_KEY": {
       "description": "for twilio integration and connected to twilio account",
-      "required": true,
-      "value": "<changeme>"
+      "required": true
     },
 
     "TWILIO_APPLICATION_SID": {
       "description": "for twilio integration and connected to twilio account",
-      "required": true,
-      "value": "<changeme>"
+      "required": true
     },
 
     "TWILIO_AUTH_TOKEN": {
       "description": "for twilio integration and connected to twilio account",
-      "required": true,
-      "value": "<changeme>"
+      "required": true
     },
 
     "TWILIO_MESSAGE_SERVICE_SID": {
       "description": "for twilio integration and connected to twilio account",
-      "required": true,
-      "value": "<changeme>"
+      "required": true
     },
 
     "TWILIO_STATUS_CALLBACK_URL": {
@@ -185,10 +175,13 @@
       "description": "Timezone to use to determine whether DST is in effect for a date",
       "required": true,
       "value": "America/New_York"
+    },
+
+    "HEROKU_APP_NAME": {
+      "required": false
     }
 
   },
-
   "addons": [
     "heroku-postgresql:hobby-dev",
     "mailgun:starter"
diff --git a/heroku.yml b/heroku.yml
new file mode 100644
index 000000000..8eec25b9c
--- /dev/null
+++ b/heroku.yml
@@ -0,0 +1,3 @@
+build:
+  docker:
+    web: Dockerfile