diff --git a/di-topology-watchdog/templates/deployment.yaml b/di-topology-watchdog/templates/deployment.yaml
index 9797fa4..880e31e 100644
--- a/di-topology-watchdog/templates/deployment.yaml
+++ b/di-topology-watchdog/templates/deployment.yaml
@@ -19,11 +19,11 @@
       - name: wait-onos-api
         image: curlimages/curl:7.78.0
         imagePullPolicy: IfNotPresent
-        command: ['sh', '-c', "until curl -I -s {{ .Values.onosAddr }}; do echo waiting for ONOS API; sleep 2; done"]
+        command: ['sh', '-c', "until curl -I -s {{ .Values.onosAddr }}:{{ .Values.onosPort }}; do echo waiting for ONOS API; sleep 2; done"]
       - name: wait-di-api
         image: curlimages/curl:7.78.0
         imagePullPolicy: IfNotPresent
-        command: ['sh', '-c', "until curl -I -s -k https://{{ .Values.diAddr }}; do echo waiting for gateway svc; sleep 2; done"]
+        command: ['sh', '-c', "until curl -I -s -k https://{{ .Values.diAddr }}:{{ .Values.diPort }}; do echo waiting for gateway svc; sleep 2; done"]
       containers:
       - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -32,8 +32,12 @@
         - "./topo_watchdog"
         - "--di-addr"
         - "{{ .Values.diAddr }}"
+        - "--di-port"
+        - "{{ .Values.diPort }}"
         - "--onos-addr"
         - "{{ .Values.onosAddr }}"
+        - "--onos-port"
+        - "{{ .Values.onosPort }}"
         {{- if .Values.withEndHost }}
         - "--k8s-subnet"
         - "{{ .Values.k8sSubnet }}"
@@ -43,6 +47,11 @@
         {{- if .Values.enableP4RuntimeTranslation }}
         - "--enable-p4runtime-translation"
         {{- end }}
+        {{- if .Values.withUp4 }}
+        - "--with-up4"
+        - "--up4-port"
+        - "{{ .Values.up4Port }}"
+        {{- end }}
       {{- if hasKey .Values.image "pullSecrets" }}
       imagePullSecrets:
         {{- range .Values.image.pullSecrets }}