diff --git a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
index a90e42604b3..80861047357 100644
--- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
@@ -203,11 +203,6 @@ def spawn(self, deployer):
         logger.info('Creating %s', instance.password_conf)
         instance.store_passwords()
 
-        # if this is not the first subsystem, skip
-        if instance.get_subsystems():
-            logger.info('Installing %s instance', instance.name)
-            return
-
         deployer.configure_server_xml()
 
         # Copy /usr/share/pki/server/conf/tomcat.conf
@@ -263,6 +258,11 @@ def spawn(self, deployer):
         if config.str2bool(deployer.mdict['pki_registry_enable']):
             instance.create_registry()
 
+        # if this is not the first subsystem, skip
+        if instance.get_subsystems():
+            logger.info('Installing %s instance', instance.name)
+            return
+
         if config.str2bool(deployer.mdict['pki_systemd_service_create']):
 
             user = deployer.mdict['pki_user']