diff --git a/tesk/api/kubernetes/convert/converter.py b/tesk/api/kubernetes/convert/converter.py
index 29d5661..0bae9a1 100644
--- a/tesk/api/kubernetes/convert/converter.py
+++ b/tesk/api/kubernetes/convert/converter.py
@@ -248,7 +248,7 @@ def from_tes_executor_to_k8s_job(  # noqa: PLR0913
         )
 
         # Set executors name based on taskmaster's job name
-        Job(executor_job).change_job_name(new_name=generated_task_id)
+        Job(executor_job).change_job_name(Task(taskmaster_name=generated_task_id).get_executor_name(executor_index))
 
         if executor_job.metadata is None:
             executor_job.metadata = V1ObjectMeta()