diff --git a/elements/swift-storage/install.d/76-swift-dirs b/elements/swift-storage/install.d/76-swift-dirs
index 1696b5d06..6c282a96e 100755
--- a/elements/swift-storage/install.d/76-swift-dirs
+++ b/elements/swift-storage/install.d/76-swift-dirs
@@ -2,4 +2,4 @@
 
 set -eux
 
-install -d -o swift -g swift /srv/node /var/cache/swift
+install -d -o swift -g swift /srv/node
diff --git a/elements/swift-storage/install.d/swift-source-install/76-swift-storage b/elements/swift-storage/install.d/swift-source-install/76-swift-storage
index 892a5bf10..79d5e5aa3 100755
--- a/elements/swift-storage/install.d/swift-source-install/76-swift-storage
+++ b/elements/swift-storage/install.d/swift-source-install/76-swift-storage
@@ -3,5 +3,17 @@
 set -eux
 
 os-svc-daemon swift-account swift swift-account-server /etc/swift/account-server.conf
+os-svc-daemon swift-account-auditor swift swift-account-auditor /etc/swift/account-server.conf
+os-svc-daemon swift-account-reaper swift swift-account-reaper /etc/swift/account-server.conf
+os-svc-daemon swift-account-replicator swift swift-account-replicator /etc/swift/account-server.conf
+
 os-svc-daemon swift-container swift swift-container-server /etc/swift/container-server.conf
+os-svc-daemon swift-container-auditor swift swift-container-auditor /etc/swift/container-server.conf
+os-svc-daemon swift-container-replicator swift swift-container-replicator /etc/swift/container-server.conf
+os-svc-daemon swift-container-sync swift swift-container-sync /etc/swift/container-server.conf
+os-svc-daemon swift-container-updater swift swift-container-updater /etc/swift/container-server.conf
+
 os-svc-daemon swift-object swift swift-object-server /etc/swift/object-server.conf
+os-svc-daemon swift-object-auditor swift swift-object-auditor /etc/swift/object-server.conf
+os-svc-daemon swift-object-replicator swift swift-object-replicator /etc/swift/object-server.conf
+os-svc-daemon swift-object-updater swift swift-object-updater /etc/swift/object-server.conf
diff --git a/elements/swift-storage/os-config-applier/etc/swift/account-server.conf b/elements/swift-storage/os-config-applier/etc/swift/account-server.conf
index b2a4b7104..b438b80b1 100644
--- a/elements/swift-storage/os-config-applier/etc/swift/account-server.conf
+++ b/elements/swift-storage/os-config-applier/etc/swift/account-server.conf
@@ -10,6 +10,15 @@ use = egg:swift#healthcheck
 
 [filter:recon]
 use = egg:swift#recon
+recon_cache_path = /mnt/state/var/cache/swift
 
 [app:account-server]
 use = egg:swift#account
+
+[account-auditor]
+recon_cache_path = /mnt/state/var/cache/swift
+
+[account-reaper]
+
+[account-replicator]
+recon_cache_path = /mnt/state/var/cache/swift
diff --git a/elements/swift-storage/os-config-applier/etc/swift/container-server.conf b/elements/swift-storage/os-config-applier/etc/swift/container-server.conf
index 4a4ee92f5..62b621c83 100644
--- a/elements/swift-storage/os-config-applier/etc/swift/container-server.conf
+++ b/elements/swift-storage/os-config-applier/etc/swift/container-server.conf
@@ -10,7 +10,19 @@ use = egg:swift#healthcheck
 
 [filter:recon]
 use = egg:swift#recon
+recon_cache_path = /mnt/state/var/cache/swift
 
 [app:container-server]
 use = egg:swift#container
 allow_versions = true
+
+[container-auditor]
+recon_cache_path = /mnt/state/var/cache/swift
+
+[container-replicator]
+recon_cache_path = /mnt/state/var/cache/swift
+
+[container-sync]
+
+[container-updater]
+recon_cache_path = /mnt/state/var/cache/swift
diff --git a/elements/swift-storage/os-config-applier/etc/swift/object-server.conf b/elements/swift-storage/os-config-applier/etc/swift/object-server.conf
index 3bc42fdec..c015f6b2b 100644
--- a/elements/swift-storage/os-config-applier/etc/swift/object-server.conf
+++ b/elements/swift-storage/os-config-applier/etc/swift/object-server.conf
@@ -10,6 +10,16 @@ use = egg:swift#healthcheck
 
 [filter:recon]
 use = egg:swift#recon
+recon_cache_path = /mnt/state/var/cache/swift
 
 [app:object-server]
 use = egg:swift#object
+
+[object-auditor]
+recon_cache_path = /mnt/state/var/cache/swift
+
+[object-replicator]
+recon_cache_path = /mnt/state/var/cache/swift
+
+[object-updater]
+recon_cache_path = /mnt/state/var/cache/swift
diff --git a/elements/swift-storage/os-refresh-config/post-configure.d/74-swift-storage b/elements/swift-storage/os-refresh-config/post-configure.d/74-swift-storage
index 8d21f9c11..3f57936e4 100755
--- a/elements/swift-storage/os-refresh-config/post-configure.d/74-swift-storage
+++ b/elements/swift-storage/os-refresh-config/post-configure.d/74-swift-storage
@@ -1,10 +1,34 @@
 #!/bin/bash
 set -eu
 
+[ -d /mnt/state/var/cache/swift ] || install -d -o swift -g swift /mnt/state/var/cache/swift
+
 os-svc-enable -n swift-account
+os-svc-enable -n swift-account-auditor
+os-svc-enable -n swift-account-reaper
+os-svc-enable -n swift-account-replicator
 os-svc-enable -n swift-container
+os-svc-enable -n swift-container-auditor
+os-svc-enable -n swift-container-replicator
+os-svc-enable -n swift-container-sync
+os-svc-enable -n swift-container-updater
 os-svc-enable -n swift-object
+os-svc-enable -n swift-object-auditor
+os-svc-enable -n swift-object-replicator
+os-svc-enable -n swift-object-updater
+os-svc-enable -n rsync
 
 os-svc-restart -n swift-account
+os-svc-restart -n swift-account-auditor
+os-svc-restart -n swift-account-reaper
+os-svc-restart -n swift-account-replicator
 os-svc-restart -n swift-container
+os-svc-restart -n swift-container-auditor
+os-svc-restart -n swift-container-replicator
+os-svc-restart -n swift-container-sync
+os-svc-restart -n swift-container-updater
 os-svc-restart -n swift-object
+os-svc-restart -n swift-object-auditor
+os-svc-restart -n swift-object-replicator
+os-svc-restart -n swift-object-updater
+os-svc-restart -n rsync