diff --git a/cmd/session/init.go b/cmd/session/init.go
index faff5bf6..31f7c11c 100644
--- a/cmd/session/init.go
+++ b/cmd/session/init.go
@@ -53,8 +53,8 @@ func init() {
 
 	// Session start flags
 	// TODO need a quick simulation environment flag
-	SessionStartCmd.Flags().String("csm-url-sls", "https://api-gw-service-nmn.local/apis/sls/v1", "(CSM Provider) Base URL for the System Layout Service (SLS)")
-	SessionStartCmd.Flags().String("csm-url-hsm", "https://api-gw-service-nmn.local/apis/smd/hsm/v2", "(CSM Provider) Base URL for the Hardware State Manager (HSM)")
+	SessionStartCmd.Flags().String("csm-url-sls", "", "(CSM Provider) Base URL for the System Layout Service (SLS)")
+	SessionStartCmd.Flags().String("csm-url-hsm", "", "(CSM Provider) Base URL for the Hardware State Manager (HSM)")
 	SessionStartCmd.Flags().BoolVarP(&insecure, "csm-insecure-https", "k", false, "(CSM Provider) Allow insecure connections when using HTTPS to CSM services")
 	SessionStartCmd.Flags().BoolVarP(&useSimulation, "csm-simulator", "S", false, "(CSM Provider) Use simulation environment URLs")
 
diff --git a/cmd/session/session_start.go b/cmd/session/session_start.go
index ae363101..afd62a7f 100644
--- a/cmd/session/session_start.go
+++ b/cmd/session/session_start.go
@@ -65,8 +65,18 @@ func startSession(cmd *cobra.Command, args []string) error {
 		log.Warn().Msg("Using simulation mode")
 		root.Conf.Session.DomainOptions.CsmOptions.UseSimulation = true
 	} else {
-		root.Conf.Session.DomainOptions.CsmOptions.BaseUrlSLS, _ = cmd.Flags().GetString("csm-url-sls")
-		root.Conf.Session.DomainOptions.CsmOptions.BaseUrlHSM, _ = cmd.Flags().GetString("csm-url-hsm")
+		slsUrl, _ := cmd.Flags().GetString("csm-url-sls")
+		if slsUrl != "" {
+			root.Conf.Session.DomainOptions.CsmOptions.BaseUrlSLS = slsUrl
+		} else {
+			root.Conf.Session.DomainOptions.CsmOptions.BaseUrlSLS = fmt.Sprintf("https://%s/apis/sls/v1", providerHost)
+		}
+		hsmUrl, _ := cmd.Flags().GetString("csm-url-hsm")
+		if hsmUrl != "" {
+			root.Conf.Session.DomainOptions.CsmOptions.BaseUrlHSM = hsmUrl
+		} else {
+			root.Conf.Session.DomainOptions.CsmOptions.BaseUrlHSM = fmt.Sprintf("https://%s/apis/smd/hsm/v2", providerHost)
+		}
 		root.Conf.Session.DomainOptions.CsmOptions.InsecureSkipVerify, _ = cmd.Flags().GetBool("csm-insecure-https")
 	}
 	if insecure {