diff --git a/apps/components/ironic.yaml b/apps/components/ironic.yaml
index 17da098fd..b7a2c4125 100644
--- a/apps/components/ironic.yaml
+++ b/apps/components/ironic.yaml
@@ -4,10 +4,23 @@ metadata:
   name: ironic
 spec:
   project: understack
-  source:
-    repoURL: https://github.com/rackerlabs/understack.git
-    path: components/13-ironic/
-    targetRevision: HEAD
+  sources:
+    - repoURL: https://github.com/rackerlabs/understack.git
+      path: components/13-ironic/
+      targetRevision: HEAD
+      directory:
+        exclude: kustomization.yaml
+        recurse: false
+    - repoURL: https://tarballs.opendev.org/openstack/openstack-helm/
+      chart: ironic
+      targetRevision: 0.2.10
+      helm:
+        valueFiles:
+          - components/13-ironic/aio-values.yaml
+          - $values/secrets/${DEPLOY_NAME}/secret-openstack.yaml
+    - repoURL: ${GIT_URL}
+      targetRevision: HEAD
+      ref: values
   destination:
     server: "https://kubernetes.default.svc"
     namespace: openstack
diff --git a/apps/components/keystone.yaml b/apps/components/keystone.yaml
index 72617b098..4cbd2bd35 100644
--- a/apps/components/keystone.yaml
+++ b/apps/components/keystone.yaml
@@ -4,10 +4,23 @@ metadata:
   name: keystone
 spec:
   project: understack
-  source:
-    repoURL: https://github.com/rackerlabs/understack.git
-    path: components/10-keystone/
-    targetRevision: HEAD
+  sources:
+    - repoURL: https://github.com/rackerlabs/understack.git
+      path: components/10-keystone/
+      targetRevision: HEAD
+      directory:
+        exclude: kustomization.yaml
+        recurse: false
+    - repoURL: https://tarballs.opendev.org/openstack/openstack-helm/
+      chart: keystone
+      targetRevision: 0.3.7
+      helm:
+        valueFiles:
+          - components/10-keystone/aio-values.yaml
+          - $values/secrets/${DEPLOY_NAME}/secret-openstack.yaml
+    - repoURL: ${GIT_URL}
+      targetRevision: HEAD
+      ref: values
   destination:
     server: "https://kubernetes.default.svc"
     namespace: openstack