diff --git a/functions/kubernetes/charts/shuffle/templates/shuffle-worker/_helpers.tpl b/functions/kubernetes/charts/shuffle/templates/shuffle-worker/_helpers.tpl
index 692fd6f2..8feafa76 100644
--- a/functions/kubernetes/charts/shuffle/templates/shuffle-worker/_helpers.tpl
+++ b/functions/kubernetes/charts/shuffle/templates/shuffle-worker/_helpers.tpl
@@ -1,9 +1,17 @@
 {{/*
 Return the common name for worker components
 */}}
+{{/*
+Shuffle currently hardcodes the shuffle-workers:33333 address at some places.
+Until that can be properly configured, we make sure that the worker deployment and service
+are named exactly the same as the deployment and service that orborus would create.
 {{- define "shuffle.worker.name" -}}
   {{- printf "%s-worker" (include "common.names.fullname" .) | trunc 63 -}}
 {{- end -}}
+*/}}
+{{- define "shuffle.worker.name" -}}
+shuffle-workers
+{{- end -}}
 
 {{/*
 Return the common labels for worker components deployed via helm.