diff --git a/README.md b/README.md
index 20104fe..cc7c7b2 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ Tested with **Ubuntu Server 18.04 LTS**.
 
 ### Steps
 
-* Create directory `/var/www/partynest/` writable by deploy user
-* Copy file `config/master.key` to `/var/www/partynest/shared/config/`
+* Create directory `/opt/partynest/` writable by deploy user
+* Copy file `config/master.key` to `/opt/partynest/shared/config/`
 * Create PostgreSQL role `partynest` with password `password`
 * Create PostgreSQL database `partynest_production` owned by `partynest`
 
@@ -68,7 +68,7 @@ StandardError=syslog
 SyslogIdentifier=partynest-web
 Type=simple
 User=user
-WorkingDirectory=/var/www/partynest/current
+WorkingDirectory=/opt/partynest/current
 
 [Install]
 WantedBy=multi-user.target
@@ -91,7 +91,7 @@ StandardError=syslog
 SyslogIdentifier=partynest-worker
 Type=simple
 User=user
-WorkingDirectory=/var/www/partynest/current
+WorkingDirectory=/opt/partynest/current
 
 [Install]
 WantedBy=multi-user.target
diff --git a/config/deploy.rb b/config/deploy.rb
index f9d94eb..bf246a0 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -10,7 +10,7 @@ set :repo_url, 'git@github.com:libertarian-party/partynest.git'
 # ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp
 
 # Default deploy_to directory is /var/www/my_app_name.
-# set :deploy_to, '/var/www/my_app_name'
+set :deploy_to, "/opt/#{fetch(:application)}"
 
 # Default value for :format is :airbrussh.
 # set :format, :airbrussh