diff --git a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py
index d783bdaac7c..0b8624d9e7c 100644
--- a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py
@@ -295,36 +295,6 @@ def spawn(self, deployer):
                 pki_target_phone_home_xml,
                 params=deployer.mdict)
 
-        # Link /var/lib/pki/<instance>/<subsystem>/conf
-        # to /etc/pki/<instance>/<subsystem>
-
-        subsystem_conf_link = os.path.join(subsystem.base_dir, 'conf')
-
-        instance.symlink(
-            subsystem.conf_dir,
-            subsystem_conf_link,
-            exist_ok=True)
-
-        # Link /var/lib/pki/<instance>/<subsystem>/logs
-        # to /var/log/pki/<instance>/<subsystem>
-
-        subsystem_logs_link = os.path.join(subsystem.base_dir, 'logs')
-
-        instance.symlink(
-            subsystem.log_dir,
-            subsystem_logs_link,
-            exist_ok=True)
-
-        # Link /var/lib/pki/<instance>/<subsystem>/registry
-        # to /etc/sysconfig/pki/tomcat/<instance>
-
-        registry_link = os.path.join(subsystem.base_dir, 'registry')
-
-        instance.symlink(
-            instance.registry_dir,
-            registry_link,
-            exist_ok=True)
-
         instance.load()
 
         subsystem = instance.get_subsystem(subsystem_name)
diff --git a/base/server/python/pki/server/subsystem.py b/base/server/python/pki/server/subsystem.py
index 30ecbf59d95..f8b68bca797 100644
--- a/base/server/python/pki/server/subsystem.py
+++ b/base/server/python/pki/server/subsystem.py
@@ -146,11 +146,29 @@ def create(self, exist_ok=False):
         # Create /var/lib/pki/<instance>/<subsystem>
         self.instance.makedirs(self.base_dir, exist_ok=exist_ok)
 
+        # Link /var/lib/pki/<instance>/<subsystem>/registry
+        # to /etc/sysconfig/pki/tomcat/<instance>
+
+        registry_link = os.path.join(self.base_dir, 'registry')
+        self.instance.symlink(
+            self.instance.registry_dir,
+            registry_link,
+            exist_ok=True)
+
     def create_conf(self, exist_ok=False):
 
         # Create /etc/pki/<instance>/<subsystem>
         self.instance.makedirs(self.conf_dir, exist_ok=exist_ok)
 
+        # Link /var/lib/pki/<instance>/<subsystem>/conf
+        # to /etc/pki/<instance>/<subsystem>
+
+        conf_link = os.path.join(self.base_dir, 'conf')
+        self.instance.symlink(
+            self.conf_dir,
+            conf_link,
+            exist_ok=exist_ok)
+
         self.config['cs.type'] = self.type
         self.config['instanceId'] = self.instance.name
         self.config['passwordClass'] = 'com.netscape.cmsutil.password.PlainPasswordFile'
@@ -175,6 +193,15 @@ def create_logs(self, exist_ok=False):
         # Create /var/log/pki/<instance>/<subsystem>
         self.instance.makedirs(self.log_dir, exist_ok=exist_ok)
 
+        # Link /var/lib/pki/<instance>/<subsystem>/logs
+        # to /var/log/pki/<instance>/<subsystem>
+
+        logs_link = os.path.join(self.base_dir, 'logs')
+        self.instance.symlink(
+            self.log_dir,
+            logs_link,
+            exist_ok=exist_ok)
+
         # Create /var/log/pki/<instance>/<subsystem>/archive
         self.instance.makedirs(self.log_archive_dir, exist_ok=exist_ok)