diff --git a/deploy/asapo_helm_chart/asapo/configs/asapo-discovery.json b/deploy/asapo_helm_chart/asapo/configs/asapo-discovery.json
index fdd03209489d3ef68a889cb2482382f6bd097e2c..11d9221013832c7df74b427ba572196e6582f924 100644
--- a/deploy/asapo_helm_chart/asapo/configs/asapo-discovery.json
+++ b/deploy/asapo_helm_chart/asapo/configs/asapo-discovery.json
@@ -1,21 +1,13 @@
 {
-  "Mode": "static",
+  "Mode": "kubernetes",
+  "Kubernetes":{
+    "Mode": "internal",
+    "Namespace": "{{ .Release.Namespace }}"
+  },
   "Receiver": {
-    "StaticEndpoints": [
-      "127.0.0.1:22001"
-    ],
     "MaxConnections": 32,
     "UseIBAddress": false
   },
-  "Broker": {
-    "StaticEndpoint": "127.0.0.1:5005"
-  },
-  "Mongo": {
-    "StaticEndpoint": "127.0.0.1:27017"
-  },
-  "FileTransferService": {
-    "StaticEndpoint": "127.0.0.1:27017"
-  },
   "Port": {{ .Values.ownServices.discovery.port }},
   "LogLevel": "debug"
 }
diff --git a/deploy/asapo_helm_chart/asapo/templates/_service.tpl b/deploy/asapo_helm_chart/asapo/templates/_service.tpl
index 09cb95b02a2512bb0eba574e56509cde5e731baf..808feac9df9b1c8b8309b3387d74f44eecdc1c43 100644
--- a/deploy/asapo_helm_chart/asapo/templates/_service.tpl
+++ b/deploy/asapo_helm_chart/asapo/templates/_service.tpl
@@ -6,6 +6,7 @@ metadata:
   name: {{ .service.serviceName }}
 spec:
   type: {{ if .service._exposeServiceExtrernally }}NodePort{{ else }}ClusterIP{{ end }}
+  {{ if .service._exposeServiceExtrernally }}externalTrafficPolicy: Local{{ end }}
   ports:
     - protocol: TCP
       port: {{ .service.port }}
diff --git a/deploy/asapo_helm_chart/asapo/templates/configs.yaml b/deploy/asapo_helm_chart/asapo/templates/configs.yaml
index 6dd1c5c49a7ded9ea4f056c4b06dbd6cab4d8f6b..7497412bbfabcfbdbc6b3389084b1d452d34ea65 100644
--- a/deploy/asapo_helm_chart/asapo/templates/configs.yaml
+++ b/deploy/asapo_helm_chart/asapo/templates/configs.yaml
@@ -1,5 +1,5 @@
 {{- range .Values.ownServices }}
-  {{ $data := dict "Chart" $.Chart "Template" $.Template "Values" $.Values "Files" $.Files "service" . }}
+  {{ $data := dict "Release" $.Release "Chart" $.Chart "Template" $.Template "Values" $.Values "Files" $.Files "service" . }}
     {{- template "asapo.configmap-fromfile" $data }}
 ---
 {{- end }}
diff --git a/deploy/asapo_helm_chart/asapo/templates/roles.yaml b/deploy/asapo_helm_chart/asapo/templates/roles.yaml
index e412266d9c9c20f74bf7dd1cbe84d139fd3e3f5f..748e9d5f10f104068ae251e694221fb1bfa1ab48 100644
--- a/deploy/asapo_helm_chart/asapo/templates/roles.yaml
+++ b/deploy/asapo_helm_chart/asapo/templates/roles.yaml
@@ -8,6 +8,7 @@ rules:
       - ""
     resources:
       - services
+      - pods
     verbs:
       - get
       - list
diff --git a/deploy/asapo_helm_chart/asapo/values.yaml b/deploy/asapo_helm_chart/asapo/values.yaml
index 1729e975aac926df7276ae560030b349e7da1c52..fb6a5359dd63f4dbc90d82fdeecaf11e52852a40 100644
--- a/deploy/asapo_helm_chart/asapo/values.yaml
+++ b/deploy/asapo_helm_chart/asapo/values.yaml
@@ -57,8 +57,7 @@ common:
   authSecret: "12ljzgneasfd"
   offlineDir: "/test_offline"
   onlineDir: "/test_online"
-  asapoVersionTag: "develop.20.03-10-g06dc0be"
-  nodesPrefix: g
+  asapoVersionTag: "feature_ASAPO-108-kubernetes-deployment.latest"
 
 influxdb:
   authEnabled: false
diff --git a/discovery/src/asapo_discovery/request_handler/request_handler_kubernetes.go b/discovery/src/asapo_discovery/request_handler/request_handler_kubernetes.go
index 0013d58ef81972c3f70f944e385f2ff89d84edc7..6173f77e8a6fea62c74cc07029f5dd7d0129e51d 100644
--- a/discovery/src/asapo_discovery/request_handler/request_handler_kubernetes.go
+++ b/discovery/src/asapo_discovery/request_handler/request_handler_kubernetes.go
@@ -23,6 +23,9 @@ type KubernetesRequestHandler struct {
 
 func (rh *KubernetesRequestHandler) GetServices(name string, use_ib bool) ([]string, error) {
 	pods, err := rh.client.CoreV1().Pods(rh.namespace).List(metav1.ListOptions{LabelSelector:"app="+name,FieldSelector:"status.phase=Running"})
+	if err != nil {
+		return []string{},err
+	}
 
 	var result = make([]string, 0)