diff --git a/code-samples/eventing/bookstore-sample-app/solution/node-server/config/100-deployment.yaml b/code-samples/eventing/bookstore-sample-app/solution/node-server/config/100-deployment.yaml
index 9a56b883383..647320fec91 100644
--- a/code-samples/eventing/bookstore-sample-app/solution/node-server/config/100-deployment.yaml
+++ b/code-samples/eventing/bookstore-sample-app/solution/node-server/config/100-deployment.yaml
@@ -29,6 +29,6 @@ spec:
     app: node-server
   ports:
     - protocol: TCP
-      port: 80
+      port: 8080
       targetPort: 8000
   type: LoadBalancer
\ No newline at end of file
diff --git a/code-samples/eventing/bookstore-sample-app/solution/node-server/config/200-broker.yaml b/code-samples/eventing/bookstore-sample-app/solution/node-server/config/200-broker.yaml
index 64da1d67df6..9f8f630d385 100644
--- a/code-samples/eventing/bookstore-sample-app/solution/node-server/config/200-broker.yaml
+++ b/code-samples/eventing/bookstore-sample-app/solution/node-server/config/200-broker.yaml
@@ -15,8 +15,4 @@ spec:
       type: moderated-comment # This is the filter that will be applied to the event, only events with the ce-type moderated-comment will be processed
       badwordfilter: good # This is the filter that will be applied to the event, only events with the ce-extension badwordfilter: good will be processed
   subscriber:
-    ref:
-      apiVersion: v1
-      kind: Service
-      name: node-server-svc
-    uri: /insert # This is the path where the event will be sent to the subscriber, see /insert in node-server code: index.js
+    uri: http://node-server-svc.default.svc.cluster.local:8080/insert # This is the path where the event will be sent to the subscriber, see /insert in node-server code: index.js
diff --git a/code-samples/eventing/bookstore-sample-app/start/node-server/config/100-deployment.yaml b/code-samples/eventing/bookstore-sample-app/start/node-server/config/100-deployment.yaml
index 9a56b883383..647320fec91 100644
--- a/code-samples/eventing/bookstore-sample-app/start/node-server/config/100-deployment.yaml
+++ b/code-samples/eventing/bookstore-sample-app/start/node-server/config/100-deployment.yaml
@@ -29,6 +29,6 @@ spec:
     app: node-server
   ports:
     - protocol: TCP
-      port: 80
+      port: 8080
       targetPort: 8000
   type: LoadBalancer
\ No newline at end of file
diff --git a/docs/bookstore/page-0.5/environment-setup.md b/docs/bookstore/page-0.5/environment-setup.md
index 6bb18215278..94f1387b82d 100644
--- a/docs/bookstore/page-0.5/environment-setup.md
+++ b/docs/bookstore/page-0.5/environment-setup.md
@@ -270,7 +270,7 @@ node-server-svc          LoadBalancer   10.101.90.35    <pending>     80:31792/T
 If port forwarding is required, open a new terminal and run:
 
 ```shell
-kubectl port-forward svc/node-server-svc 8080:80
+kubectl port-forward svc/node-server-svc 8080:8080
 ```
 You should see the following output:
 
diff --git a/docs/bookstore/page-6/advanced-event-filtering.md b/docs/bookstore/page-6/advanced-event-filtering.md
index e3d461c7017..ded562eaa53 100644
--- a/docs/bookstore/page-6/advanced-event-filtering.md
+++ b/docs/bookstore/page-6/advanced-event-filtering.md
@@ -36,11 +36,7 @@ Append the following Trigger configuration to the existing `node-server/config/2
           type: moderated-comment # This is the filter that will be applied to the event, only events with the ce-type moderated-comment will be processed
           badwordfilter: good # This is the filter that will be applied to the event, only events with the ce-extension badwordfilter: good will be processed
       subscriber:
-        ref:
-          apiVersion: v1
-          kind: Service
-          name: node-server-svc
-        uri: /insert # This is the path where the event will be sent to the subscriber, see /insert in node-server code: index.js
+        uri: http://node-server-svc.default.svc.cluster.local:8080/insert # This is the path where the event will be sent to the subscriber, see /insert in node-server code: index.js
     ```
 
 ```shell