diff --git a/roles/openstack_helm_glance/tasks/main.yml b/roles/openstack_helm_glance/tasks/main.yml
index 7493534..6c42404 100644
--- a/roles/openstack_helm_glance/tasks/main.yml
+++ b/roles/openstack_helm_glance/tasks/main.yml
@@ -31,7 +31,9 @@
           namespace: openstack
         spec:
           interval: 60s
-          url: https://opendev.org/openstack/openstack-helm-infra
+          url: https://github.com/vexxhost/openstack-helm-infra
+          ref:
+            commit: 9b4b13f9477f12a7647dc6e20e8f4127229b6eae
 
       - apiVersion: source.toolkit.fluxcd.io/v1beta2
         kind: GitRepository
diff --git a/roles/openstack_helm_infra_openvswitch/defaults/main.yml b/roles/openstack_helm_infra_openvswitch/defaults/main.yml
index bfa3729..77d070a 100644
--- a/roles/openstack_helm_infra_openvswitch/defaults/main.yml
+++ b/roles/openstack_helm_infra_openvswitch/defaults/main.yml
@@ -14,13 +14,13 @@
 # .. envvar:: openstack_helm_infra_openvswitch_image_repository [[[
 #
 # Image repository location to be prefixed for all images
-openstack_helm_infra_openvswitch_image_repository: "{{ atmosphere_image_repository | default('us-docker.pkg.dev/vexxhost-infra/openstack') }}"
+openstack_helm_infra_openvswitch_image_repository: "{{ atmosphere_image_repository | default('quay.io/vexxhost') }}"
 
                                                                    # ]]]
 # .. envvar:: openstack_helm_infra_openvswitch_image_tag [[[
 #
 # Image tag for container
-openstack_helm_infra_openvswitch_image_tag: "{{ atmosphere_openstack_release | default('wallaby') }}"
+openstack_helm_infra_openvswitch_image_tag: "{{ atmosphere_openstack_release | default('2.17.0') }}"
 
                                                                    # ]]]
 # .. envvar:: openstack_helm_infra_openvswitch_values [[[
diff --git a/roles/openstack_helm_infra_openvswitch/meta/main.yml b/roles/openstack_helm_infra_openvswitch/meta/main.yml
index c3a069a..bc3f67d 100644
--- a/roles/openstack_helm_infra_openvswitch/meta/main.yml
+++ b/roles/openstack_helm_infra_openvswitch/meta/main.yml
@@ -22,6 +22,3 @@
     - name: Ubuntu
       versions:
         - focal
-
-dependencies:
-  - role: atmosphere
diff --git a/roles/openstack_helm_infra_openvswitch/tasks/main.yml b/roles/openstack_helm_infra_openvswitch/tasks/main.yml
index 11be0b7..fd60015 100644
--- a/roles/openstack_helm_infra_openvswitch/tasks/main.yml
+++ b/roles/openstack_helm_infra_openvswitch/tasks/main.yml
@@ -24,6 +24,17 @@
   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: 9b4b13f9477f12a7647dc6e20e8f4127229b6eae
+
       - apiVersion: v1
         kind: Secret
         metadata:
@@ -42,10 +53,9 @@
           timeout: 60m
           chart:
             spec:
-              chart: openvswitch
-              version: 0.1.6
+              chart: ./openvswitch
               sourceRef:
-                kind: HelmRepository
+                kind: GitRepository
                 name: openstack-helm-infra
           install:
             disableWait: true