diff --git a/packages/system/kamaji-etcd/Makefile b/packages/system/kamaji-etcd/Makefile
index 25d7155d..b2f909b8 100644
--- a/packages/system/kamaji-etcd/Makefile
+++ b/packages/system/kamaji-etcd/Makefile
@@ -6,3 +6,4 @@ update:
 	sed -i 's/hook-failed/before-hook-creation,hook-failed/' `grep -rl hook-failed charts`
 	patch -p4 < patches/fix-svc.diff
 	patch -p4 < patches/fullnameOverride.diff
+	patch -p4 < patches/remove-plus.patch
diff --git a/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl b/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl
index 403e187a..e68a9674 100644
--- a/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl
+++ b/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl
@@ -119,11 +119,7 @@ Name of the etcd root-client secret.
 Retrieve the current Kubernetes version to launch a kubectl container with the minimum version skew possible.
 */}}
 {{- define "etcd.jobsTagKubeVersion" -}}
-{{- if contains "-eks-" .Capabilities.KubeVersion.GitVersion }}
 {{- print "v" .Capabilities.KubeVersion.Major "." (.Capabilities.KubeVersion.Minor | replace "+" "") -}}
-{{- else }}
-{{- print "v" .Capabilities.KubeVersion.Major "." .Capabilities.KubeVersion.Minor -}}
-{{- end }}
 {{- end }}
 
 {{/*
diff --git a/packages/system/kamaji-etcd/patches/remove-plus.patch b/packages/system/kamaji-etcd/patches/remove-plus.patch
new file mode 100644
index 00000000..55bba3b8
--- /dev/null
+++ b/packages/system/kamaji-etcd/patches/remove-plus.patch
@@ -0,0 +1,16 @@
+diff --git a/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl b/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl
+index 403e187..e68a967 100644
+--- a/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl
++++ b/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl
+@@ -119,11 +119,7 @@ Name of the etcd root-client secret.
+ Retrieve the current Kubernetes version to launch a kubectl container with the minimum version skew possible.
+ */}}
+ {{- define "etcd.jobsTagKubeVersion" -}}
+-{{- if contains "-eks-" .Capabilities.KubeVersion.GitVersion }}
+ {{- print "v" .Capabilities.KubeVersion.Major "." (.Capabilities.KubeVersion.Minor | replace "+" "") -}}
+-{{- else }}
+-{{- print "v" .Capabilities.KubeVersion.Major "." .Capabilities.KubeVersion.Minor -}}
+-{{- end }}
+ {{- end }}
+ 
+ {{/*