diff --git a/Solutions/SAP BTP/Data Connectors/SAPBTPPollerConnector/SAPBTP_DataConnectorDefinition.json b/Solutions/SAP BTP/Data Connectors/SAPBTPPollerConnector/SAPBTP_DataConnectorDefinition.json
index a40ad402f7..c0bffe2dff 100644
--- a/Solutions/SAP BTP/Data Connectors/SAPBTPPollerConnector/SAPBTP_DataConnectorDefinition.json	
+++ b/Solutions/SAP BTP/Data Connectors/SAPBTPPollerConnector/SAPBTP_DataConnectorDefinition.json	
@@ -119,18 +119,18 @@
                                                 "type": "Textbox",
                                                 "parameters": {
                                                     "label": "Authorization server URL (UAA server)",
-                                                    "placeholder": "Authorization server URL",
+                                                    "placeholder": "https://your-tenant.authentication.region.hana.ondemand.com",
                                                     "type": "text",
-                                                    "name": "https://your-tenant.authentication.region.hana.ondemand.com"
+                                                    "name": "authServerUrl"
                                                 }
                                             },
                                             {
                                                 "type": "Textbox",
                                                 "parameters": {
                                                     "label": "Audit Retrieval API URL",
-                                                    "placeholder": "Audit Retrieval API URL",
+                                                    "placeholder": "https://auditlog-management.cfapps.region.hana.ondemand.com",
                                                     "type": "text",
-                                                    "name": "https://auditlog-management.cfapps.region.hana.ondemand.com"
+                                                    "name": "auditHost"
                                                 }
                                             }
                                         ]
diff --git a/Solutions/SAP BTP/Package/3.0.8.zip b/Solutions/SAP BTP/Package/3.0.8.zip
index bfd8914cbb..3251a6e25e 100644
Binary files a/Solutions/SAP BTP/Package/3.0.8.zip and b/Solutions/SAP BTP/Package/3.0.8.zip differ
diff --git a/Solutions/SAP BTP/Package/mainTemplate.json b/Solutions/SAP BTP/Package/mainTemplate.json
index 9e13f13ff8..2ebec059d4 100644
--- a/Solutions/SAP BTP/Package/mainTemplate.json	
+++ b/Solutions/SAP BTP/Package/mainTemplate.json	
@@ -967,18 +967,18 @@
                                                                         "type": "Textbox",
                                                                         "parameters": {
                                                                             "label": "Authorization server URL (UAA server)",
-                                                                            "placeholder": "Authorization server URL",
+                                                                            "placeholder": "https://your-tenant.authentication.region.hana.ondemand.com",
                                                                             "type": "text",
-                                                                            "name": "https://your-tenant.authentication.region.hana.ondemand.com"
+                                                                            "name": "authServerUrl"
                                                                         }
                                                                     },
                                                                     {
                                                                         "type": "Textbox",
                                                                         "parameters": {
                                                                             "label": "Audit Retrieval API URL",
-                                                                            "placeholder": "Audit Retrieval API URL",
+                                                                            "placeholder": "https://auditlog-management.cfapps.region.hana.ondemand.com",
                                                                             "type": "text",
-                                                                            "name": "https://auditlog-management.cfapps.region.hana.ondemand.com"
+                                                                            "name": "auditHost"
                                                                         }
                                                                     }
                                                                 ]
@@ -1321,18 +1321,18 @@
                                                         "type": "Textbox",
                                                         "parameters": {
                                                             "label": "Authorization server URL (UAA server)",
-                                                            "placeholder": "Authorization server URL",
+                                                            "placeholder": "https://your-tenant.authentication.region.hana.ondemand.com",
                                                             "type": "text",
-                                                            "name": "https://your-tenant.authentication.region.hana.ondemand.com"
+                                                            "name": "authServerUrl"
                                                         }
                                                     },
                                                     {
                                                         "type": "Textbox",
                                                         "parameters": {
                                                             "label": "Audit Retrieval API URL",
-                                                            "placeholder": "Audit Retrieval API URL",
+                                                            "placeholder": "https://auditlog-management.cfapps.region.hana.ondemand.com",
                                                             "type": "text",
-                                                            "name": "https://auditlog-management.cfapps.region.hana.ondemand.com"
+                                                            "name": "auditHost"
                                                         }
                                                     }
                                                 ]
@@ -1447,13 +1447,13 @@
                             "type": "securestring",
                             "minLength": 1
                         },
-                        "https://your-tenant.authentication.region.hana.ondemand.com": {
-                            "defaultValue": "https://your-tenant.authentication.region.hana.ondemand.com",
+                        "authServerUrl": {
+                            "defaultValue": "authServerUrl",
                             "type": "string",
                             "minLength": 1
                         },
-                        "https://auditlog-management.cfapps.region.hana.ondemand.com": {
-                            "defaultValue": "https://auditlog-management.cfapps.region.hana.ondemand.com",
+                        "auditHost": {
+                            "defaultValue": "auditHost",
                             "type": "string",
                             "minLength": 1
                         },