diff --git a/charts/nebulous-overlay-network-manager/templates/service.yaml b/charts/nebulous-overlay-network-manager/templates/service.yaml
index dd4ebf8..777a2e7 100644
--- a/charts/nebulous-overlay-network-manager/templates/service.yaml
+++ b/charts/nebulous-overlay-network-manager/templates/service.yaml
@@ -8,11 +8,11 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.pgadminPort }}
-      targetPort: pgadmin
+      targetPort: {{ .Values.service.pgadminPort }}
       protocol: TCP
       name: pgadmin
-    - port: {{ .Values.service.onmApiPort }}
-      targetPort: onm-api
+    - port: {{ .Values.service.onmApiExposePort }}
+      targetPort: {{ .Values.service.onmApiApplicationPort }}
       protocol: TCP
       name: onm-api
   selector:
diff --git a/charts/nebulous-overlay-network-manager/values.yaml b/charts/nebulous-overlay-network-manager/values.yaml
index 8549524..b454417 100644
--- a/charts/nebulous-overlay-network-manager/values.yaml
+++ b/charts/nebulous-overlay-network-manager/values.yaml
@@ -40,7 +40,8 @@ service:
   type: ClusterIP
   port: 80
   pgadminPort: 5050
-  onmApiPort: 8082
+  onmApiExposePort: 8082
+  onmApiApplicationPort: 8080
 
 ingress:
   enabled: false