diff --git a/redmine/defaults/main.yml b/redmine/defaults/main.yml
index ed5b5ab8..113d0116 100644
--- a/redmine/defaults/main.yml
+++ b/redmine/defaults/main.yml
@@ -61,7 +61,8 @@ unicorn_listen_address: 127.0.0.1
 unicorn_worker_processes: 5
 unicorn_timeout: 120
 unicorn_log_dir: /var/log/unicorn
-unicorn_pid_file: /run/unicorn/unicorn.pid
+unicorn_pid_dir: /run/unicorn
+unicorn_pid_file: '{{ unicorn_pid_dir }}/unicorn.pid'
 unicorn_gems:
   - unicorn
   - coderay
diff --git a/redmine/tasks/unicorn.yml b/redmine/tasks/unicorn.yml
index 4224e608..636539b7 100644
--- a/redmine/tasks/unicorn.yml
+++ b/redmine/tasks/unicorn.yml
@@ -16,16 +16,16 @@
 - name: Install the unicorn startup file for redmine
   copy: src=redmine.init dest=/etc/init.d/redmine owner=root group=root mode=0755
   when: ruby_use_unicorn
-  tags: [ 'ruby', 'redmine', 'unicorn' ]
+  tags: [ 'ruby', 'redmine', 'unicorn', 'unicorn_init' ]
 
 - name: Install the unicorn defaults file
   template: src=unicorn-redmine.default.j2 dest=/etc/default/unicorn-redmine owner=root group=root mode=0644
   notify: Reload unicorn when needed
-  tags: [ 'ruby', 'redmine', 'unicorn', 'unicorn_conf' ]
+  tags: [ 'ruby', 'redmine', 'unicorn', 'unicorn_init', 'unicorn_conf' ]
   
 - name: Install the unicorn logrotate file
   template: src=unicorn-logrotate.j2 dest=/etc/logrotate.d/unicorn-redmine owner=root group=root mode=0644
-  tags: [ 'ruby', 'redmine', 'unicorn', 'unicorn_conf' ]
+  tags: [ 'ruby', 'redmine', 'unicorn', 'unicorn_logrotate', 'unicorn_conf' ]
 
 - name: Install the unicorn config
   template: src=unicorn.conf.rb.j2 dest={{ redmine_glob_root_dir }}/{{ redmine_inst_dir }}/config/unicorn.conf.rb owner=root group=root mode=0644
diff --git a/redmine/templates/unicorn-redmine.default.j2 b/redmine/templates/unicorn-redmine.default.j2
index 12ea38bb..9109da99 100644
--- a/redmine/templates/unicorn-redmine.default.j2
+++ b/redmine/templates/unicorn-redmine.default.j2
@@ -4,4 +4,5 @@ DAEMON=unicorn
 DAEMON_OPTS="-c $APP/config/unicorn.conf.rb -E production -D -l {{ unicorn_listen_address }}:3999"
 NAME=unicorn
 DESC="Unicorn app for $USER"
+PID_DIR={{ unicorn_pid_dir }}
 PID={{ unicorn_pid_file }}