diff --git a/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml
index 7a00f37e..721d2d1b 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml
+++ b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml
@@ -207,7 +207,6 @@ Methods:
       - $template: $resources.yaml('DeletePods.template').bind(dict(labels => $labels))
       - $.masterNode.instance.agent.call($template, $resources)
 
-
   createService:
     Arguments:
       - applicationName:
@@ -220,7 +219,7 @@ Methods:
     Body:
       - $.serviceEndpoints: $.getAttr(serviceEndpoints, list())
       - $currentEndpoints: $.serviceEndpoints.where($.applicationName = $applicationName and $.podId = $podId and $.scope = internal)
-      - $serviceName: format('svc-{0}', randomName())
+      - $serviceName: format('{0}-{1}', randomName(), $applicationName).substring(0, 24).toLower()
       - $endpointMap: {}
       - For: endpoint
         In: $currentEndpoints