diff --git a/pipeline/backend/docker/convert.go b/pipeline/backend/docker/convert.go
index 003186a36..b1d0fd8ca 100644
--- a/pipeline/backend/docker/convert.go
+++ b/pipeline/backend/docker/convert.go
@@ -70,7 +70,7 @@ func (e *docker) toConfig(step *types.Step, options BackendOptions) *container.C
 }
 
 func toContainerName(step *types.Step, workflowName string) string {
-	return "wp_" + workflowName + "-" + step.Name + "-" + step.UUID[:5]
+	return "wp_" + workflowName + "-" + step.Name + "-" + step.UUID[len(step.UUID)-5:]
 }
 
 // returns a container host configuration.
diff --git a/pipeline/backend/kubernetes/pod.go b/pipeline/backend/kubernetes/pod.go
index 506dec18a..93f5f58bf 100644
--- a/pipeline/backend/kubernetes/pod.go
+++ b/pipeline/backend/kubernetes/pod.go
@@ -77,7 +77,7 @@ func stepToPodName(step *types.Step, workflowName string) (name string, err erro
 }
 
 func podName(step *types.Step, workflowName string) (string, error) {
-	return dnsName(podPrefix + workflowName + "-" + step.Name + "-" + step.UUID[:5])
+	return dnsName(podPrefix + workflowName + "-" + step.Name + "-" + step.UUID[len(step.UUID)-5:])
 }
 
 func podMeta(step *types.Step, config *config, options BackendOptions, podName, workflowName string) (meta_v1.ObjectMeta, error) {
diff --git a/pipeline/backend/kubernetes/service.go b/pipeline/backend/kubernetes/service.go
index 45c49472a..1f5aad35c 100644
--- a/pipeline/backend/kubernetes/service.go
+++ b/pipeline/backend/kubernetes/service.go
@@ -63,7 +63,7 @@ func mkService(step *types.Step, config *config, workflowName string) (*v1.Servi
 }
 
 func serviceName(step *types.Step, workflowName string) (string, error) {
-	return dnsName(servicePrefix + workflowName + "-" + step.Name + "-" + step.UUID[:5])
+	return dnsName(servicePrefix + workflowName + "-" + step.Name + "-" + step.UUID[len(step.UUID)-5:])
 }
 
 func servicePort(port types.Port) v1.ServicePort {