diff --git a/roles/openstack_helm_glance/tasks/main.yml b/roles/openstack_helm_glance/tasks/main.yml
index 6c42404..43641e1 100644
--- a/roles/openstack_helm_glance/tasks/main.yml
+++ b/roles/openstack_helm_glance/tasks/main.yml
@@ -33,7 +33,7 @@
           interval: 60s
           url: https://github.com/vexxhost/openstack-helm-infra
           ref:
-            commit: 9b4b13f9477f12a7647dc6e20e8f4127229b6eae
+            commit: 24726dffd6f1e5ac91620e92e04a782cb94340e8
 
       - apiVersion: source.toolkit.fluxcd.io/v1beta2
         kind: GitRepository
@@ -44,7 +44,7 @@
           interval: 60s
           url: https://github.com/vexxhost/openstack-helm
           ref:
-            commit: 8348cb0d995b2c52a5bd3d3d3e1d9b7ffb517ee9
+            commit: 340c5840434d510d5c977618fea236403ca1bbfb
           include:
             - repository:
                 name: openstack-helm-infra
diff --git a/roles/openstack_helm_infra_openvswitch/tasks/main.yml b/roles/openstack_helm_infra_openvswitch/tasks/main.yml
index fd60015..7b828df 100644
--- a/roles/openstack_helm_infra_openvswitch/tasks/main.yml
+++ b/roles/openstack_helm_infra_openvswitch/tasks/main.yml
@@ -33,7 +33,7 @@
           interval: 60s
           url: https://github.com/vexxhost/openstack-helm-infra
           ref:
-            commit: 9b4b13f9477f12a7647dc6e20e8f4127229b6eae
+            commit: 24726dffd6f1e5ac91620e92e04a782cb94340e8
 
       - apiVersion: v1
         kind: Secret
diff --git a/roles/openstack_helm_neutron/tasks/main.yml b/roles/openstack_helm_neutron/tasks/main.yml
index 76083f7..dba1bd7 100644
--- a/roles/openstack_helm_neutron/tasks/main.yml
+++ b/roles/openstack_helm_neutron/tasks/main.yml
@@ -24,6 +24,32 @@
   kubernetes.core.k8s:
     state: present
     definition:
+      - apiVersion: source.toolkit.fluxcd.io/v1beta2
+        kind: GitRepository
+        metadata:
+          name: openstack-helm-infra
+          namespace: openstack
+        spec:
+          interval: 60s
+          url: https://github.com/vexxhost/openstack-helm-infra
+          ref:
+            commit: 24726dffd6f1e5ac91620e92e04a782cb94340e8
+
+      - apiVersion: source.toolkit.fluxcd.io/v1beta2
+        kind: GitRepository
+        metadata:
+          name: openstack-helm
+          namespace: openstack
+        spec:
+          interval: 60s
+          url: https://github.com/vexxhost/openstack-helm
+          ref:
+            commit: 340c5840434d510d5c977618fea236403ca1bbfb
+          include:
+            - repository:
+                name: openstack-helm-infra
+              toPath: ../openstack-helm-infra
+
       - apiVersion: v1
         kind: Secret
         metadata:
@@ -41,10 +67,9 @@
           interval: 60s
           chart:
             spec:
-              chart: neutron
-              version: 0.2.14
+              chart: ./neutron
               sourceRef:
-                kind: HelmRepository
+                kind: GitRepository
                 name: openstack-helm
           install:
             disableWait: true