diff --git a/.git-crypt/.gitattributes b/.git-crypt/.gitattributes
new file mode 100644
index 00000000..17ef6016
--- /dev/null
+++ b/.git-crypt/.gitattributes
@@ -0,0 +1,3 @@
+# Do not edit this file.  To specify the files to encrypt, create your own
+# .gitattributes file in the directory where your files are.
+* !filter !diff
diff --git a/.git-crypt/keys/default/0/260F34CF197E4BAEC8FCB18D3F53E6CCAA9B0520.gpg b/.git-crypt/keys/default/0/260F34CF197E4BAEC8FCB18D3F53E6CCAA9B0520.gpg
new file mode 100644
index 00000000..cff3baa1
Binary files /dev/null and b/.git-crypt/keys/default/0/260F34CF197E4BAEC8FCB18D3F53E6CCAA9B0520.gpg differ
diff --git a/.git-crypt/keys/default/0/290DB155720C634A6B2FB8C6B0F6FDFF8C265086.gpg b/.git-crypt/keys/default/0/290DB155720C634A6B2FB8C6B0F6FDFF8C265086.gpg
new file mode 100644
index 00000000..987b3c5a
Binary files /dev/null and b/.git-crypt/keys/default/0/290DB155720C634A6B2FB8C6B0F6FDFF8C265086.gpg differ
diff --git a/.git-crypt/keys/default/0/E56903992FD8A1780E87A9B3B1EB127DB82FB666.gpg b/.git-crypt/keys/default/0/E56903992FD8A1780E87A9B3B1EB127DB82FB666.gpg
new file mode 100644
index 00000000..49d4d584
Binary files /dev/null and b/.git-crypt/keys/default/0/E56903992FD8A1780E87A9B3B1EB127DB82FB666.gpg differ
diff --git a/.gitattributes b/.gitattributes
index 95883dea..011b6259 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,7 @@
 * text=auto
+
+resources/environments/.env.stage filter=git-crypt diff=git-crypt
+resources/environments/.env.production filter=git-crypt diff=git-crypt
+
 *.css linguist-vendored
 *.less linguist-vendored
diff --git a/config/cache.php b/config/cache.php
index f4098123..fa3644f0 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'default' => env('CACHE_DRIVER', 'file'),
+    'default' => env('CACHE_DRIVER', 'database'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/.env.example b/resources/environments/.env.example
similarity index 92%
rename from .env.example
rename to resources/environments/.env.example
index 723ea439..dce9ce8c 100644
--- a/.env.example
+++ b/resources/environments/.env.example
@@ -1,5 +1,6 @@
 APP_ENV=local
 APP_DEBUG=true
+APP_URL=http://pony.fm.local/
 APP_KEY=SomeRandomString
 
 DB_HOST=localhost
@@ -7,7 +8,6 @@ DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
 
-CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
diff --git a/vagrant/.env.local b/resources/environments/.env.local
similarity index 93%
rename from vagrant/.env.local
rename to resources/environments/.env.local
index fda90e51..92fad214 100644
--- a/vagrant/.env.local
+++ b/resources/environments/.env.local
@@ -1,5 +1,6 @@
 APP_ENV=local
 APP_DEBUG=true
+APP_URL=http://pony.fm.local/
 APP_KEY=AQUSDTDK5xA04yb9eO9iwlm72NpC8e90
 
 DB_HOST=localhost
@@ -7,7 +8,6 @@ DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
 
-CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
diff --git a/resources/environments/.env.production b/resources/environments/.env.production
new file mode 100644
index 00000000..81394d4c
Binary files /dev/null and b/resources/environments/.env.production differ
diff --git a/resources/environments/.env.stage b/resources/environments/.env.stage
new file mode 100644
index 00000000..76abe1a3
Binary files /dev/null and b/resources/environments/.env.stage differ
diff --git a/vagrant/install.sh b/vagrant/install.sh
index 9de7edf6..feea69bb 100755
--- a/vagrant/install.sh
+++ b/vagrant/install.sh
@@ -31,7 +31,7 @@ cd /vagrant
 /usr/local/bin/composer self-update
 composer install
 
-cp "/vagrant/vagrant/.env.local" "/vagrant/.env"
+cp "/vagrant/resources/environments/.env.local" "/vagrant/.env"
 
 php artisan migrate
 php artisan db:seed