diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml
index 713ebcd..602c7b2 100644
--- a/kubernetes-manifests/adservice.yaml
+++ b/kubernetes-manifests/adservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: server
+      - name: addserver
         image: adservice
         ports:
         - containerPort: 9555
diff --git a/kubernetes-manifests/cartservice.yaml b/kubernetes-manifests/cartservice.yaml
index fcfe0f5..0c29e3a 100644
--- a/kubernetes-manifests/cartservice.yaml
+++ b/kubernetes-manifests/cartservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: server
+      - name: cartserver
         image: cartservice
         ports:
         - containerPort: 7070
diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml
index 501210a..ae30e63 100644
--- a/kubernetes-manifests/checkoutservice.yaml
+++ b/kubernetes-manifests/checkoutservice.yaml
@@ -26,7 +26,7 @@ spec:
         app: checkoutservice
     spec:
       containers:
-        - name: server
+        - name: checkoutserver
           image: checkoutservice
           ports:
           - containerPort: 5050
diff --git a/kubernetes-manifests/currencyservice.yaml b/kubernetes-manifests/currencyservice.yaml
index 6d1b21a..b9d0a0d 100644
--- a/kubernetes-manifests/currencyservice.yaml
+++ b/kubernetes-manifests/currencyservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: server
+      - name: currencyserver
         image: currencyservice
         ports:
         - name: grpc
diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml
index 2ae3823..0a95ca3 100644
--- a/kubernetes-manifests/emailservice.yaml
+++ b/kubernetes-manifests/emailservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: server
+      - name: emailserver
         image: emailservice
         ports:
         - containerPort: 8080
diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml
index 5c5cd32..27c0605 100644
--- a/kubernetes-manifests/frontend.yaml
+++ b/kubernetes-manifests/frontend.yaml
@@ -26,7 +26,7 @@ spec:
         app: frontend
     spec:
       containers:
-        - name: server
+        - name: frontendserver
           image: frontend
           ports:
           - containerPort: 8080
@@ -63,8 +63,14 @@ spec:
             value: "checkoutservice:5050"
           - name: AD_SERVICE_ADDR
             value: "adservice:9555"
-          # - name: JAEGER_SERVICE_ADDR
-          #   value: "jaeger-collector:14268"
+          - name: JAEGER_SERVICE_HOST
+            valueFrom:
+              fieldRef:
+                fieldPath: spec.nodeName
+          - name: JAEGER_SERVICE_PORT
+            value: "42699"
+          - name: JAEGER_SERVICE_PATH
+            value: "/com.instana.plugin.jaeger.trace"
           resources:
             requests:
               cpu: 100m
diff --git a/kubernetes-manifests/paymentservice.yaml b/kubernetes-manifests/paymentservice.yaml
index fa62c08..bc83a98 100644
--- a/kubernetes-manifests/paymentservice.yaml
+++ b/kubernetes-manifests/paymentservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: server
+      - name: paymentserver
         image: paymentservice
         ports:
         - containerPort: 50051
diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml
index b175856..8309ff6 100644
--- a/kubernetes-manifests/productcatalogservice.yaml
+++ b/kubernetes-manifests/productcatalogservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: server
+      - name: productcatalogserver
         image: productcatalogservice
         ports:
         - containerPort: 3550
diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml
index 1ccc4ab..994f0db 100644
--- a/kubernetes-manifests/recommendationservice.yaml
+++ b/kubernetes-manifests/recommendationservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: server
+      - name: recommendationserver
         image: recommendationservice
         ports:
         - containerPort: 8080
diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml
index d4049ad..4d2da82 100644
--- a/kubernetes-manifests/shippingservice.yaml
+++ b/kubernetes-manifests/shippingservice.yaml
@@ -26,7 +26,7 @@ spec:
         app: shippingservice
     spec:
       containers:
-      - name: server
+      - name: shippingserver
         image: shippingservice
         ports:
         - containerPort: 50051
diff --git a/src/frontend/main.go b/src/frontend/main.go
index 5ba9577..f4873e0 100644
--- a/src/frontend/main.go
+++ b/src/frontend/main.go
@@ -145,16 +145,21 @@ func main() {
 
 func initJaegerTracing(log logrus.FieldLogger) {
 
-	svcAddr := os.Getenv("JAEGER_SERVICE_ADDR")
-	if svcAddr == "" {
+	svcHost := os.Getenv("JAEGER_SERVICE_HOST")
+	if svcHost == "" {
 		log.Info("jaeger initialization disabled.")
 		return
 	}
 
+	svcPort := os.Getenv("JAEGER_SERVICE_PORT")
+	svcPath := os.Getenv("JAEGER_SERVICE_PATH")
+        svcFull := fmt.Sprintf("http://%s:%s%s", svcHost, svcPort, svcPath)
+
 	// Register the Jaeger exporter to be able to retrieve
 	// the collected spans.
 	exporter, err := jaeger.NewExporter(jaeger.Options{
-		Endpoint: fmt.Sprintf("http://%s", svcAddr),
+		// Endpoint: fmt.Sprintf("http://%s:%s%s", svcHost, svcPort, svcPath),
+		Endpoint: svcFull,
 		Process: jaeger.Process{
 			ServiceName: "frontend",
 		},
@@ -163,7 +168,7 @@ func initJaegerTracing(log logrus.FieldLogger) {
 		log.Fatal(err)
 	}
 	trace.RegisterExporter(exporter)
-	log.Info("jaeger initialization completed.")
+	log.Info("jaeger initialization completed. connected to ", svcFull)
 }
 
 func initStats(log logrus.FieldLogger, exporter *stackdriver.Exporter) {