diff --git a/projects/core/manifests/metallb.yaml b/projects/core/manifests/metallb.yaml
new file mode 100644
index 00000000..7828d4e2
--- /dev/null
+++ b/projects/core/manifests/metallb.yaml
@@ -0,0 +1,55 @@
+---
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
+metadata:
+  name: default
+  namespace: metallb
+spec:
+  addresses:
+    - 192.168.1.13/32
+    - 192.168.1.15/32
+    - 192.168.1.16/32
+    - 192.168.1.17/32
+    - 192.168.1.18/32
+    - 192.168.1.19/32
+    - 192.168.1.20/32
+---
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
+metadata:
+  name: dns
+  namespace: metallb
+spec:
+  addresses:
+    - 192.168.1.53/32
+---
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
+metadata:
+  name: external
+  namespace: metallb
+spec:
+  addresses:
+    - 192.168.1.12/32
+---
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
+metadata:
+  name: internal
+  namespace: metallb
+spec:
+  addresses:
+    - 192.168.1.11/32
+#   - 192.168.1.14/32
+---
+apiVersion: metallb.io/v1beta1
+kind: L2Advertisement
+metadata:
+  name: l2advertisement
+  namespace: metallb
+spec:
+    ipAddressPools:
+      - default
+      - dns
+      - external
+      - internal
diff --git a/projects/core/project.yml b/projects/core/project.yml
index 76cd4f94..ce07cc2a 100644
--- a/projects/core/project.yml
+++ b/projects/core/project.yml
@@ -29,10 +29,10 @@ apps:
     value: /data/kubernetes/ssd
 
 - name: metallb
-  repoURL: https://charts.bitnami.com/bitnami
+  repoURL: https://metallb.github.io/metallb
   chart: metallb
   namespace: metallb
-  targetRevision: 2.5.16
+  targetRevision: 0.13.4
   syncWave: '0'
 
 - name: cert-manager
diff --git a/projects/core/values/metallb.yaml b/projects/core/values/metallb.yaml
index 94934c7e..e49e6e70 100644
--- a/projects/core/values/metallb.yaml
+++ b/projects/core/values/metallb.yaml
@@ -1,34 +1,24 @@
-configInline:
-  address-pools:
-  - name: default
-    protocol: layer2
-    addresses:
-    - 192.168.1.13/32
-    - 192.168.1.15/32
-    - 192.168.1.16/32
-    - 192.168.1.17/32
-    - 192.168.1.18/32
-    - 192.168.1.19/32
-    - 192.168.1.20/32
-
-  - name: dns
-    protocol: layer2
-    addresses:
-    - 192.168.1.53/32
-
-  - name: external
-    protocol: layer2
-    addresses:
-    - 192.168.1.12/32
-
-  - name: internal
-    protocol: layer2
-    addresses:
-    - 192.168.1.11/32
-    - 192.168.1.14/32
+psp:
+  enabled: false
 
 prometheus:
   serviceMonitor:
     enabled: true
   prometheusRule:
     enabled: true
+
+  rbacProxy:
+    repository: gcr.io/kubebuilder/kube-rbac-proxy
+    tag: v0.12.0
+
+controller:
+  image:
+    repository: quay.io/metallb/controller
+    ## == Chart Version
+    #tag:
+
+speaker:
+  image:
+    repository: quay.io/metallb/speaker
+    ## == Chart Version
+    #tag: v0.13.4