diff --git a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-service.yaml b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-service.yaml
index 5b86382b..fc31b7c4 100644
--- a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-service.yaml
+++ b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-service.yaml
@@ -41,3 +41,9 @@ spec:
     - name: websub-https
       protocol: TCP
       port: 8021
+    - name: websocket-http
+      protocol: TCP
+      port: 9099
+    - name: websocket-https
+      protocol: TCP
+      port: 8099
diff --git a/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml b/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml
index e65d9b77..20bdf7e1 100644
--- a/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml
+++ b/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-conf.yaml
@@ -149,7 +149,7 @@ data:
     enable = true
     username= "$ref{super_admin.username}"
     password= "$ref{super_admin.password}"
-    service_url = "https://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-service:${mgt.transport.https.port}/services/"
+    service_url = "https://{{ template "am-pattern-4.resource.prefix" . }}-am-cp-service:${mgt.transport.https.port}/services/"
     event_listening_endpoints = ["tcp://localhost:5672"]
     event_duplicate_url = ["tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-cp-2-service:5672"]
 
diff --git a/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml b/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml
index f936dbbb..1e78aeaa 100644
--- a/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml
+++ b/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-conf.yaml
@@ -67,7 +67,7 @@ data:
     [truststore]
     file_name = "client-truststore.jks"
     type = "JKS"
-    password = "wso2carbon
+    password = "wso2carbon"
 
     #[keystore.primary]
     #file_name =  "wso2carbon.jks"
@@ -150,7 +150,7 @@ data:
     enable = true
     username= "$ref{super_admin.username}"
     password= "$ref{super_admin.password}"
-    service_url = "https://{{ template "am-pattern-3.resource.prefix" . }}-am-cp-service:${mgt.transport.https.port}/services/"
+    service_url = "https://{{ template "am-pattern-4.resource.prefix" . }}-am-cp-service:${mgt.transport.https.port}/services/"
     event_listening_endpoints = ["tcp://localhost:5672"]
     event_duplicate_url = ["tcp://{{ template "am-pattern-4.resource.prefix" . }}-am-cp-1-service:5672"]
 
diff --git a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-service.yaml b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-service.yaml
index 97221148..940bc015 100644
--- a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-service.yaml
+++ b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-service.yaml
@@ -41,3 +41,9 @@ spec:
     - name: websub-https
       protocol: TCP
       port: 8021
+    - name: websocket-http
+      protocol: TCP
+      port: 9099
+    - name: websocket-https
+      protocol: TCP
+      port: 8099
diff --git a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml
index 72adbe04..6c1d28f1 100644
--- a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml
+++ b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-conf.yaml
@@ -67,7 +67,7 @@ data:
     [truststore]
     file_name = "client-truststore.jks"
     type = "JKS"
-    password = "wso2carbon
+    password = "wso2carbon"
 
     #[keystore.primary]
     #file_name =  "wso2carbon.jks"