diff --git a/defaults/main.yml b/defaults/main.yml
index 18b43066..be47d7e5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -296,6 +296,7 @@ swift_services:
     program_name: "swift-account-replicator-server"
     program_binary: "swift-account-server"
     program_config_options: "/etc/swift/account-server/account-server-replicator.conf"
+    service_en: "{{ swift_dedicated_replication | bool }}"
   swift-account-server:
     group: swift_acc
     program_name: "swift-account-server"
@@ -317,6 +318,7 @@ swift_services:
     program_name: "swift-container-replicator-server"
     program_binary: "swift-container-server"
     program_config_options: "/etc/swift/container-server/container-server-replicator.conf"
+    service_en: "{{ swift_dedicated_replication | bool }}"
   swift-container-server:
     group: swift_cont
     program_name: "swift-container-server"
@@ -346,6 +348,7 @@ swift_services:
     program_name: "swift-object-replicator-server"
     program_binary: "swift-object-server"
     program_config_options: "/etc/swift/object-server/object-server-replicator.conf"
+    service_en: "{{ swift_dedicated_replication | bool }}"
   swift-object-server:
     group: swift_obj
     program_name: "swift-object-server"
diff --git a/handlers/main.yml b/handlers/main.yml
index e3331209..5d7dbd01 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -30,7 +30,9 @@
     state: "restarted"
     pattern: "{{ item.value.program_name }}"
   with_dict: "{{ swift_services }}"
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - "{{ item.value.service_en | default(true) }}"
 
 - name: Restart rsyslog
   service:
diff --git a/tasks/swift_init_common.yml b/tasks/swift_init_common.yml
index df178ff8..dd8150ce 100644
--- a/tasks/swift_init_common.yml
+++ b/tasks/swift_init_common.yml
@@ -26,6 +26,8 @@
    name: "{{ item.value.program_name }}"
    enabled: "yes"
   with_dict: "{{ swift_services }}"
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - "{{ item.value.service_en | default(true) }}"
   notify:
     - Restart swift services
diff --git a/tasks/swift_sync_post_install.yml b/tasks/swift_sync_post_install.yml
index 0d995a40..bd681b29 100644
--- a/tasks/swift_sync_post_install.yml
+++ b/tasks/swift_sync_post_install.yml
@@ -19,4 +19,6 @@
     state: "started"
     pattern: "{{ item.value.program_name }}"
   with_dict: "{{ swift_services }}"
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - "{{ item.value.service_en | default(true) }}"
diff --git a/templates/swift-systemd-init.j2 b/templates/swift-systemd-init.j2
index 20518bdb..9da036ac 100644
--- a/templates/swift-systemd-init.j2
+++ b/templates/swift-systemd-init.j2
@@ -12,7 +12,7 @@ Group={{ swift_system_group_name }}
 {% if item.value.program_override is defined %}
 ExecStart={{ item.value.program_override }} {{ item.value.program_config_options|default('') }}
 {% else %}
-ExecStart={{ swift_bin }}/{{ item.value.program_name }} {{ item.value.program_config_options|default('') }}
+ExecStart={{ swift_bin }}/{{ item.value.program_binary | default(item.value.program_name) }} {{ item.value.program_config_options|default('') }}
 {% endif %}
 
 # Give a reasonable amount of time for the server to start up/shut down
diff --git a/templates/swift-systemd-tempfiles.j2 b/templates/swift-systemd-tempfiles.j2
index 9b044fa2..eef54ded 100644
--- a/templates/swift-systemd-tempfiles.j2
+++ b/templates/swift-systemd-tempfiles.j2
@@ -1,4 +1,4 @@
 # {{ ansible_managed }}
 
-D /var/lock/{{ item.value.program_name }} 2755 {{ swift_system_user_name }} {{ swift_system_group_name }}
-D /var/run/{{ item.value.program_name }} 2755 {{ swift_system_user_name }} {{ swift_system_group_name }}
+D /var/lock/{{ item.value.program_binary | default(item.value.program_name) }} 2755 {{ swift_system_user_name }} {{ swift_system_group_name }}
+D /var/run/{{ item.value.program_binary | default(item.value.program_name) }} 2755 {{ swift_system_user_name }} {{ swift_system_group_name }}
diff --git a/templates/swift-upstart-init.j2 b/templates/swift-upstart-init.j2
index 274fe83c..5c8a10f4 100644
--- a/templates/swift-upstart-init.j2
+++ b/templates/swift-upstart-init.j2
@@ -1,8 +1,4 @@
 # {{ ansible_managed }}
-{% if not swift_dedicated_replication and 'replicator-server' in item.value.program_name %}
-# Blank script - dedicated replication network not in use
-{% else %}
-
 description "{{ item.value.program_name }}"
 author "Kevin Carter <kevin.carter@rackspace.com>"
 
@@ -41,4 +37,3 @@ exec start-stop-daemon --start \
                        --make-pidfile \
                        --pidfile /var/run/{{ item.value.program_binary | default(item.value.program_name) }}/{{ item.value.program_name }}.pid \
                        --exec "{{ item.value.program_override|default('$RUNBIN') }}" "{{ item.value.program_config_options|default('') }}"
-{% endif %}