diff --git a/common/replicatedservice/v2/replicatedservice.py b/common/replicatedservice/v2/replicatedservice.py
index a6ef0d71ed..43a9d9bf6f 100644
--- a/common/replicatedservice/v2/replicatedservice.py
+++ b/common/replicatedservice/v2/replicatedservice.py
@@ -160,8 +160,9 @@ def GenerateServicePorts(context, name):
   Returns:
     A dict containing a port definition
   """
-  service_port = context.properties.get('service_port', None)
-  target_port = context.properties.get('target_port', None)
+  container_port = context.properties.get('container_port', None)
+  target_port = context.properties.get('target_port', container_port)
+  service_port = context.properties.get('service_port', target_port)
   protocol = context.properties.get('protocol')
 
   ports = {}