diff --git a/config/daemons.yml b/config/daemons.yml
index 856ff19ab..e5c5f1b0d 100644
--- a/config/daemons.yml
+++ b/config/daemons.yml
@@ -1,6 +1,5 @@
 dir_mode: script
-dir: ../../tmp/pids
-log_dir: <%= File.expand_path("../../log", __FILE__) %>
+dir: ../../log/que
 multiple: true
 backtrace: true
 monitor: true
diff --git a/config/deploy.rb b/config/deploy.rb
index 40a8a5ace..b24060f6b 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -181,8 +181,8 @@ task setup: :environment do
   queue! %(mkdir -p "#{deploy_to}/shared/import/legal_documents")
   queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/import/legal_documents")
 
-  queue! %(mkdir -p "#{deploy_to}/shared/tmp/pids")
-  queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/tmp/pids")
+  queue! %(mkdir -p "#{deploy_to}/shared/log/que")
+  queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/log/que")
 
   queue! %(touch "#{deploy_to}/shared/config/database.yml")
   deploy do
@@ -205,8 +205,8 @@ task deploy: :environment do
     invoke :load_commit_hash
 
     # TEMP until all servers are updated
-    queue! %(mkdir -p "#{deploy_to}/shared/tmp/pids")
-    queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/tmp/pids")
+    queue! %(mkdir -p "#{deploy_to}/shared/log/que")
+    queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/log/que")
 
     invoke :'deploy:link_shared_paths'
     invoke :'bundle:install'
diff --git a/doc/que/README.md b/doc/que/README.md
index 1dddd8fc3..e7d3032d0 100644
--- a/doc/que/README.md
+++ b/doc/que/README.md
@@ -25,7 +25,7 @@ Installation at deployed server:
 PID files
 ---------
 
-All pid files are at tmp/pids directory.
+All pid files are at log/que directory.
 
 Debugging
 ---------