diff --git a/.env.example.php b/.env.example.php
index 6b3e9c98..2c49017c 100644
--- a/.env.example.php
+++ b/.env.example.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'APP_DEBUG'   => getenv('APP_DEBUG') ?: false,
     'DB_DRIVER'   => 'mysql',
     'DB_HOST'     => 'localhost',
     'DB_DATABASE' => 'cachet',
diff --git a/.env.heroku.php b/.env.heroku.php
index 8b2a91e8..967e3cf5 100644
--- a/.env.heroku.php
+++ b/.env.heroku.php
@@ -4,6 +4,7 @@ $dbURL = parse_url(getenv('DATABASE_URL'));
 $dbName = substr($dbURL["path"], 1);
 
 return [
+    'APP_DEBUG'   => getenv('APP_DEBUG') ?: false,
     'DB_HOST'     => $dbURL['host'],
     'DB_DATABASE' => $dbName,
     'DB_USERNAME' => $dbURL['user'],
diff --git a/app/config/app.php b/app/config/app.php
index a4d5eebc..671dc42e 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'debug' => false,
+    'debug' => getenv('APP_DEBUG') ?: false,
 
     /*
     |--------------------------------------------------------------------------
diff --git a/app/config/local/.gitkeep b/app/config/local/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/app/config/local/app.php b/app/config/local/app.php
deleted file mode 100644
index c6d8ebc4..00000000
--- a/app/config/local/app.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Application Debug Mode
-    |--------------------------------------------------------------------------
-    |
-    | When your application is in debug mode, detailed error messages with
-    | stack traces will be shown on every error that occurs within your
-    | application. If disabled, a simple generic error page is shown.
-    |
-    */
-
-    'debug' => true,
-
-];