diff --git a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py
index 8663db0ee1..43e22d119e 100644
--- a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py
+++ b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py
@@ -351,7 +351,6 @@ def __deploy(self):
         self.__set_domain_attributes()
         self._configure_security_configuration()
         self.__deploy_resources_and_apps()
-        self.__configure_opss_secrets()
         self.wlst_helper.update_domain()
         self.wlst_helper.close_domain()
         return
@@ -490,6 +489,8 @@ def __create_domain_with_select_template(self, domain_home):
         if len(server_assigns) > 0:
             self.target_helper.target_server_groups(server_assigns)
 
+        self.__configure_opss_secrets()
+
         self.wlst_helper.write_domain(domain_home)
         self.wlst_helper.close_template()
 
@@ -1134,6 +1135,10 @@ def __create_boot_dot_properties(self):
 
     def __configure_opss_secrets(self):
         _method_name = '__configure_opss_secrets'
+
+        if not self._domain_typedef.is_jrf_domain_type():
+            return
+
         self.logger.entering(class_name=self.__class_name, method_name=_method_name)
         extract_path = None
         domain_info = self._domain_info