Merge "[SDC] Remove MR connection in SDC-BE"
diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
index 212864b..86d3408 100644
--- a/kubernetes/sdc/Chart.yaml
+++ b/kubernetes/sdc/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: Service Design and Creation Umbrella Helm charts
 name: sdc
-version: 13.0.0
+version: 13.0.1
 
 dependencies:
   - name: common
diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 2f0bb07..59cb865 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -19,7 +19,11 @@
         },
         "ECompP": {
             "ecomp_rest_url": "https://portal-app.{{include "common.namespace" .}}:8443/ONAPPORTAL/auxapi",
+            {{- if .Values.global.kafka.useKafka }}
+            "ueb_url_list": "no-message-router.{{include "common.namespace" .}}, message-router.{{include "common.namespace" .}}",
+            {{- else }}
             "ueb_url_list": "message-router.{{include "common.namespace" .}}, message-router.{{include "common.namespace" .}}",
+            {{- end }}
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
             "app_key": "x9UfO7JsDn8BESVX",
             "inbox_name": "ECOMP-PORTAL-INBOX",
@@ -31,8 +35,13 @@
             "PublicKey": "iPIxkpAMI8qTcQj8",
             "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
             "fqdn": [
+                {{- if .Values.global.kafka.useKafka }}
+                "no-message-router.{{include "common.namespace" .}}",
+                "no-message-router.{{include "common.namespace" .}}"
+                {{- else }}
                 "message-router.{{include "common.namespace" .}}",
                 "message-router.{{include "common.namespace" .}}"
+                {{- end }}
             ]
         },
         "Kafka": {