diff --git a/roles/sap_swpm/defaults/main.yml b/roles/sap_swpm/defaults/main.yml
index 28913cb7..45d31984 100644
--- a/roles/sap_swpm/defaults/main.yml
+++ b/roles/sap_swpm/defaults/main.yml
@@ -236,9 +236,14 @@ sap_swpm_java_scs_instance_hostname: ""
 sap_swpm_master_password:
 
 # New Install - define DDIC 000 password
-# Restore - DDIC 000 password from backup
+#  If not set, DDIC will be set to the master password
+# Restore - DDIC 000 password from
 sap_swpm_ddic_000_password:
 
+# New Install - define SAP* 000 password
+#  If not set, SAP* will be set to the master password
+sap_swpm_sapstar_000_password:
+
 # initial = not an HA setup
 # set this in the input file when installing ascs, ers to indicate an HA setup
 sap_swpm_virtual_hostname:
diff --git a/roles/sap_swpm/templates/inifile_params.j2 b/roles/sap_swpm/templates/inifile_params.j2
index 94f0cb8f..0441c55a 100644
--- a/roles/sap_swpm/templates/inifile_params.j2
+++ b/roles/sap_swpm/templates/inifile_params.j2
@@ -308,7 +308,7 @@ Sdb_Schema_Dialogs.dbSchemaPassword = {{ sap_swpm_db_schema_password }}
 # BEGIN section credentials_nwas_ssfs                             #
 #                                                                 #
 HDB_Userstore.useABAPSSFS = true
-# NW_ABAP_SSFS_CustomKey.ssfsKeyInputFile = 
+# NW_ABAP_SSFS_CustomKey.ssfsKeyInputFile =
 #                                                                 #
 #  END  section credentials_nwas_ssfs                             #
 ###################################################################
@@ -328,6 +328,28 @@ HDB_Userstore.useABAPSSFS = false
 #  END  section credentials_hdbuserstore                          #
 ###################################################################
 {% endif %}
+{% if sap_swpm_ddic_000_password | d('',true) | length > 0 %}
+
+###################################################################
+# BEGIN section credentials_install_ddic_000                      #
+#                                                                 #
+NW_CI_Instance_ABAP_Reports.needNewDDIC000Password = true
+NW_CI_Instance_ABAP_Reports.ddic000Password = {{ sap_swpm_ddic_000_password }}
+#                                                                 #
+#  END  section credentials_install_ddic_000                      #
+###################################################################
+{% endif %}
+{% if sap_swpm_sapstar_000_password | d('',true) | length > 0 %}
+
+###################################################################
+# BEGIN section credentials_install_sapstar_000                   #
+#                                                                 #
+NW_CI_Instance_ABAP_Reports.needNewSapStar000Password = true
+NW_CI_Instance_ABAP_Reports.sapStar000Password = {{ sap_swpm_sapstar_000_password }}
+#                                                                 #
+#  END  section credentials_install_sapstar_000                   #
+###################################################################
+{% endif %}
 {% if 'credentials_syscopy' in sap_swpm_inifile_sections_list %}
 
 ###################################################################
@@ -509,10 +531,10 @@ SYB.NW_DB.userstore_hostname = {{ sap_swpm_ascs_instance_hostname }}
 
 # To avoid conflicts, leave all Ports blank and SAP SWPM will auto-assign
 # Ports by default are in order 4901, 4902, 4903, 4904. For each new ASE DB Server instance on the host, each port number is incremented by 4
-SYB.NW_DB.portDatabaseServer = 
-SYB.NW_DB.portBackupServer = 
-SYB.NW_DB.portJobScheduler = 
-SYB.NW_DB.portXPServer = 
+SYB.NW_DB.portDatabaseServer =
+SYB.NW_DB.portBackupServer =
+SYB.NW_DB.portJobScheduler =
+SYB.NW_DB.portXPServer =
 #                                                                 #
 #  END  section db_config_anydb_sapase                            #
 ###################################################################
@@ -712,7 +734,7 @@ NW_JAVA_Export.keyPhrase = {{ sap_swpm_master_password }}
 # Formerly called the Central Instance (CI).
 NW_CI_Instance.ciVirtualHostname = {{ sap_swpm_pas_instance_hostname }}
 NW_CI_Instance.ciInstanceNumber = {{ sap_swpm_pas_instance_nr }}
-# NW_CI_Instance.nodesNum = 
+# NW_CI_Instance.nodesNum =
 # NW_CI_Instance.nodesNumber = defNodes
 # NW_WPConfiguration.ciBtcWPNumber = 6
 # NW_WPConfiguration.ciDialogWPNumber = 10
@@ -766,7 +788,7 @@ nw_instance_ers.restartSCS = false
 #                                                                 #
 NW_CI_Instance.ciMSPort = 36{{ sap_swpm_ascs_instance_nr }}
 NW_checkMsgServer.abapMSPort = 36{{ sap_swpm_ascs_instance_nr }}
-# NW_CI_Instance.ciMSPortInternal = 
+# NW_CI_Instance.ciMSPortInternal =
 # NW_CI_Instance.createGlobalProxyInfoFile = false
 # NW_CI_Instance.createGlobalRegInfoFile = false
 # NW_CI_Instance.scsMSPortInternal =