diff --git a/enterprise/metallb/5.0.3/CHANGELOG.md b/enterprise/metallb/5.0.4/CHANGELOG.md
similarity index 82%
rename from enterprise/metallb/5.0.3/CHANGELOG.md
rename to enterprise/metallb/5.0.4/CHANGELOG.md
index 7b1dc1a5d49..6349792cb67 100644
--- a/enterprise/metallb/5.0.3/CHANGELOG.md
+++ b/enterprise/metallb/5.0.4/CHANGELOG.md
@@ -2,6 +2,25 @@
 
 
 
+## [metallb-5.0.4](https://github.com/truecharts/charts/compare/metallb-4.0.21...metallb-5.0.4) (2022-11-06)
+
+### Chore
+
+- Auto-update chart README [skip ci]
+  - Auto-update chart README [skip ci]
+  - Auto-update chart README [skip ci]
+
+  ### Feat
+
+- rework metallb to use manifest-included metallb ([#4320](https://github.com/truecharts/charts/issues/4320))
+
+  ### Fix
+
+- Ensure metallb is running before creating resources ([#4321](https://github.com/truecharts/charts/issues/4321))
+
+
+
+
 ## [metallb-5.0.3](https://github.com/truecharts/charts/compare/metallb-4.0.21...metallb-5.0.3) (2022-11-06)
 
 ### Chore
@@ -78,22 +97,3 @@
 
 
 ## [metallb-4.0.17](https://github.com/truecharts/charts/compare/metallb-4.0.16...metallb-4.0.17) (2022-10-19)
-
-### Chore
-
-- Auto-update chart README [skip ci]
-  - update helm general non-major ([#4122](https://github.com/truecharts/charts/issues/4122))
-
-  ### Fix
-
-- enable crd updating ([#4068](https://github.com/truecharts/charts/issues/4068))
-
-
-
-
-## [metallb-4.0.16](https://github.com/truecharts/charts/compare/metallb-4.0.15...metallb-4.0.16) (2022-10-12)
-
-### Chore
-
-- Auto-update chart README [skip ci]
-  - update helm general non-major ([#4071](https://github.com/truecharts/charts/issues/4071))
diff --git a/enterprise/metallb/5.0.3/Chart.lock b/enterprise/metallb/5.0.4/Chart.lock
similarity index 80%
rename from enterprise/metallb/5.0.3/Chart.lock
rename to enterprise/metallb/5.0.4/Chart.lock
index f85f554e578..9e588f9e4e6 100644
--- a/enterprise/metallb/5.0.3/Chart.lock
+++ b/enterprise/metallb/5.0.4/Chart.lock
@@ -3,4 +3,4 @@ dependencies:
   repository: https://library-charts.truecharts.org
   version: 10.8.0
 digest: sha256:d785b2570d9d8e34bc823031f8475942fc79600ba0164ec2185e7d6d7c4db697
-generated: "2022-11-06T20:02:47.669989681Z"
+generated: "2022-11-06T21:27:48.415551776Z"
diff --git a/enterprise/metallb/5.0.3/Chart.yaml b/enterprise/metallb/5.0.4/Chart.yaml
similarity index 98%
rename from enterprise/metallb/5.0.3/Chart.yaml
rename to enterprise/metallb/5.0.4/Chart.yaml
index 21afdd0844e..2bdd7787b37 100644
--- a/enterprise/metallb/5.0.3/Chart.yaml
+++ b/enterprise/metallb/5.0.4/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/enterprise/metallb/5.0.3/README.md b/enterprise/metallb/5.0.4/README.md
similarity index 100%
rename from enterprise/metallb/5.0.3/README.md
rename to enterprise/metallb/5.0.4/README.md
diff --git a/enterprise/metallb/5.0.3/app-readme.md b/enterprise/metallb/5.0.4/app-readme.md
similarity index 100%
rename from enterprise/metallb/5.0.3/app-readme.md
rename to enterprise/metallb/5.0.4/app-readme.md
diff --git a/enterprise/metallb/5.0.3/charts/common-10.8.0.tgz b/enterprise/metallb/5.0.4/charts/common-10.8.0.tgz
similarity index 100%
rename from enterprise/metallb/5.0.3/charts/common-10.8.0.tgz
rename to enterprise/metallb/5.0.4/charts/common-10.8.0.tgz
diff --git a/enterprise/metallb/5.0.3/ci/basic-values.yaml b/enterprise/metallb/5.0.4/ci/basic-values.yaml
similarity index 100%
rename from enterprise/metallb/5.0.3/ci/basic-values.yaml
rename to enterprise/metallb/5.0.4/ci/basic-values.yaml
diff --git a/enterprise/metallb/5.0.3/ci/pool-values.yaml b/enterprise/metallb/5.0.4/ci/pool-values.yaml
similarity index 100%
rename from enterprise/metallb/5.0.3/ci/pool-values.yaml
rename to enterprise/metallb/5.0.4/ci/pool-values.yaml
diff --git a/enterprise/metallb/5.0.3/ix_values.yaml b/enterprise/metallb/5.0.4/ix_values.yaml
similarity index 100%
rename from enterprise/metallb/5.0.3/ix_values.yaml
rename to enterprise/metallb/5.0.4/ix_values.yaml
diff --git a/enterprise/metallb/5.0.3/questions.yaml b/enterprise/metallb/5.0.4/questions.yaml
similarity index 100%
rename from enterprise/metallb/5.0.3/questions.yaml
rename to enterprise/metallb/5.0.4/questions.yaml
diff --git a/enterprise/metallb/5.0.3/templates/_bgpadvertisement.tpl b/enterprise/metallb/5.0.4/templates/_bgpadvertisement.tpl
similarity index 93%
rename from enterprise/metallb/5.0.3/templates/_bgpadvertisement.tpl
rename to enterprise/metallb/5.0.4/templates/_bgpadvertisement.tpl
index 8800867bea3..1ce8b9a7550 100644
--- a/enterprise/metallb/5.0.3/templates/_bgpadvertisement.tpl
+++ b/enterprise/metallb/5.0.4/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/enterprise/metallb/5.0.3/templates/_community.tpl b/enterprise/metallb/5.0.4/templates/_community.tpl
similarity index 87%
rename from enterprise/metallb/5.0.3/templates/_community.tpl
rename to enterprise/metallb/5.0.4/templates/_community.tpl
index 3684a2e8d06..24aed9168b4 100644
--- a/enterprise/metallb/5.0.3/templates/_community.tpl
+++ b/enterprise/metallb/5.0.4/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/enterprise/metallb/5.0.3/templates/_ipaddresspool.tpl b/enterprise/metallb/5.0.4/templates/_ipaddresspool.tpl
similarity index 89%
rename from enterprise/metallb/5.0.3/templates/_ipaddresspool.tpl
rename to enterprise/metallb/5.0.4/templates/_ipaddresspool.tpl
index 2393d082b12..e4b04e4d796 100644
--- a/enterprise/metallb/5.0.3/templates/_ipaddresspool.tpl
+++ b/enterprise/metallb/5.0.4/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/enterprise/metallb/5.0.3/templates/_l2advertisement.tpl b/enterprise/metallb/5.0.4/templates/_l2advertisement.tpl
similarity index 91%
rename from enterprise/metallb/5.0.3/templates/_l2advertisement.tpl
rename to enterprise/metallb/5.0.4/templates/_l2advertisement.tpl
index a63374623a8..651b0b0d79a 100644
--- a/enterprise/metallb/5.0.3/templates/_l2advertisement.tpl
+++ b/enterprise/metallb/5.0.4/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/enterprise/metallb/5.0.3/templates/_peers.tpl b/enterprise/metallb/5.0.4/templates/_peers.tpl
similarity index 96%
rename from enterprise/metallb/5.0.3/templates/_peers.tpl
rename to enterprise/metallb/5.0.4/templates/_peers.tpl
index 58d7d108103..44c8feeffc1 100644
--- a/enterprise/metallb/5.0.3/templates/_peers.tpl
+++ b/enterprise/metallb/5.0.4/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/enterprise/metallb/5.0.3/templates/_wait.tpl b/enterprise/metallb/5.0.4/templates/_wait.tpl
similarity index 94%
rename from enterprise/metallb/5.0.3/templates/_wait.tpl
rename to enterprise/metallb/5.0.4/templates/_wait.tpl
index 587f2532329..ed29440a385 100644
--- a/enterprise/metallb/5.0.3/templates/_wait.tpl
+++ b/enterprise/metallb/5.0.4/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 }}
diff --git a/enterprise/metallb/5.0.3/templates/common.yaml b/enterprise/metallb/5.0.4/templates/common.yaml
similarity index 100%
rename from enterprise/metallb/5.0.3/templates/common.yaml
rename to enterprise/metallb/5.0.4/templates/common.yaml
diff --git a/enterprise/metallb/5.0.3/values.yaml b/enterprise/metallb/5.0.4/values.yaml
similarity index 100%
rename from enterprise/metallb/5.0.3/values.yaml
rename to enterprise/metallb/5.0.4/values.yaml