diff --git a/packages/system-test/src/main/skel/etc/layouts/system-test.conf b/packages/system-test/src/main/skel/etc/layouts/system-test.conf
index 5f327ea6158..486c2161426 100644
--- a/packages/system-test/src/main/skel/etc/layouts/system-test.conf
+++ b/packages/system-test/src/main/skel/etc/layouts/system-test.conf
@@ -76,7 +76,7 @@ pool.path=${dcache.home}/var/pools/pool_r3
 pool.lfs=precious
 
 [dCacheDomain/spacemanager]
-SpaceManagerLinkGroupAuthorizationFileName=${dcache.paths.etc}/linkgroup.conf
+spacemanager.authz.link-group-file-name=${dcache.paths.etc}/linkgroup.conf
 
 [dCacheDomain/pinmanager]
 [dCacheDomain/cleaner]
diff --git a/skel/share/defaults/spacemanager.properties b/skel/share/defaults/spacemanager.properties
index 0316542fe7c..319acdb7243 100644
--- a/skel/share/defaults/spacemanager.properties
+++ b/skel/share/defaults/spacemanager.properties
@@ -60,6 +60,11 @@ spacemanager.authz.link-group-file-name=${SpaceManagerLinkGroupAuthorizationFile
 
 (one-of?true|false|${dcache.enable.spacemanager})spacemanager.enable.spacemanager=${dcache.enable.spacemanager}
 
+
+# Cell communication related properties
+spacemanager.service.poolmanager=${dcache.service.poolmanager}
+spacemanager.service.pnfsmanager=${dcache.service.pnfsmanager}
+
 #
 # Database related settings reserved for internal use.
 #