diff --git a/charts/enterprise/metallb/Chart.yaml b/charts/enterprise/metallb/Chart.yaml
index 21afdd0844e..2bdd7787b37 100644
--- a/charts/enterprise/metallb/Chart.yaml
+++ b/charts/enterprise/metallb/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://github.com/metallb/metallb
   - https://metallb.universe.tf
 type: application
-version: 5.0.3
+version: 5.0.4
 annotations:
   truecharts.org/catagories: |
     - core
diff --git a/charts/enterprise/metallb/templates/_bgpadvertisement.tpl b/charts/enterprise/metallb/templates/_bgpadvertisement.tpl
index 8800867bea3..1ce8b9a7550 100644
--- a/charts/enterprise/metallb/templates/_bgpadvertisement.tpl
+++ b/charts/enterprise/metallb/templates/_bgpadvertisement.tpl
@@ -4,7 +4,7 @@
 apiVersion: metallb.io/v1beta1
 kind: BGPAdvertisement
 metadata:
-  name: {{ $.Release.Name }}-{{ .name }}
+  name: {{ .name }}
   namespace: metallb-system
 spec:
   ipAddressPools:
diff --git a/charts/enterprise/metallb/templates/_community.tpl b/charts/enterprise/metallb/templates/_community.tpl
index 3684a2e8d06..24aed9168b4 100644
--- a/charts/enterprise/metallb/templates/_community.tpl
+++ b/charts/enterprise/metallb/templates/_community.tpl
@@ -4,7 +4,7 @@
 apiVersion: metallb.io/v1beta1
 kind: Community
 metadata:
-  name: {{ $.Release.Name }}-communities
+  name: communities
   namespace: metallb-system
 spec:
   communities:
diff --git a/charts/enterprise/metallb/templates/_ipaddresspool.tpl b/charts/enterprise/metallb/templates/_ipaddresspool.tpl
index 2393d082b12..e4b04e4d796 100644
--- a/charts/enterprise/metallb/templates/_ipaddresspool.tpl
+++ b/charts/enterprise/metallb/templates/_ipaddresspool.tpl
@@ -4,7 +4,7 @@
 apiVersion: metallb.io/v1beta1
 kind: IPAddressPool
 metadata:
-  name: {{ $.Release.Name }}-{{ .name }}
+  name: {{ .name }}
   namespace: metallb-system
 spec:
   addresses:
diff --git a/charts/enterprise/metallb/templates/_l2advertisement.tpl b/charts/enterprise/metallb/templates/_l2advertisement.tpl
index a63374623a8..651b0b0d79a 100644
--- a/charts/enterprise/metallb/templates/_l2advertisement.tpl
+++ b/charts/enterprise/metallb/templates/_l2advertisement.tpl
@@ -4,7 +4,7 @@
 apiVersion: metallb.io/v1beta1
 kind: L2Advertisement
 metadata:
-  name: {{ $.Release.Name }}-{{ .name }}
+  name: {{ .name }}
   namespace: metallb-system
 spec:
   ipAddressPools:
diff --git a/charts/enterprise/metallb/templates/_peers.tpl b/charts/enterprise/metallb/templates/_peers.tpl
index 58d7d108103..44c8feeffc1 100644
--- a/charts/enterprise/metallb/templates/_peers.tpl
+++ b/charts/enterprise/metallb/templates/_peers.tpl
@@ -4,7 +4,7 @@
 apiVersion: metallb.io/v1beta2
 kind: BGPPeer
 metadata:
-  name: {{ $.Release.Name }}-{{ .name }}
+  name: {{ .name }}
   namespace: metallb-system
 spec:
   {{- with .password }}
diff --git a/charts/enterprise/metallb/templates/_wait.tpl b/charts/enterprise/metallb/templates/_wait.tpl
index 587f2532329..ed29440a385 100644
--- a/charts/enterprise/metallb/templates/_wait.tpl
+++ b/charts/enterprise/metallb/templates/_wait.tpl
@@ -1,5 +1,5 @@
-{{- define "metallb.wait" -}}
-{{- $fullName := include "tc.common.names.fullname" . -}}
+{{- define "metallb.wait" }}
+{{- $fullName := include "tc.common.names.fullname" . }}
 ---
 apiVersion: batch/v1
 kind: Job
@@ -65,4 +65,4 @@ metadata:
     "helm.sh/hook": pre-install, pre-upgrade
     "helm.sh/hook-weight": "-2"
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
-{{- end -}}
+{{- end }}