diff --git a/charts/apps/.gitignore b/charts/apps/.gitignore
new file mode 100644
index 00000000..948259a7
--- /dev/null
+++ b/charts/apps/.gitignore
@@ -0,0 +1 @@
+charts/*.tgz
diff --git a/charts/apps/Chart.lock b/charts/apps/Chart.lock
new file mode 100644
index 00000000..959467ac
--- /dev/null
+++ b/charts/apps/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: https://charts.bitnami.com/bitnami
+  version: 2.23.0
+digest: sha256:ae278a480aa271c2be01318fe3e1a44fd1b8c60fe007a7ffcb4887a7764ca1df
+generated: "2025-01-10T16:33:23.730652614Z"
diff --git a/charts/apps/Chart.yaml b/charts/apps/Chart.yaml
index 727735b2..18f47baa 100644
--- a/charts/apps/Chart.yaml
+++ b/charts/apps/Chart.yaml
@@ -2,4 +2,8 @@ apiVersion: v2
 name: authz
 description: ArgoCD Apps used to deploy Authorization infrastructure
 type: application
-version: 0.2.0
+version: 0.2.1
+dependencies:
+  - name: common
+    repository: https://charts.bitnami.com/bitnami
+    version: 2.23.0
diff --git a/charts/apps/templates/bundler-app.yaml b/charts/apps/templates/bundler-app.yaml
index eb2a6dce..ef84e239 100644
--- a/charts/apps/templates/bundler-app.yaml
+++ b/charts/apps/templates/bundler-app.yaml
@@ -2,7 +2,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: bundler
+  name: {{ include "common.names.fullname" $ }}-bundler
   namespace: {{ .Release.Namespace }}
   finalizers:
     - resources-finalizer.argocd.arogproj.io
diff --git a/charts/apps/templates/opa-app.yaml b/charts/apps/templates/opa-app.yaml
index f46a6c87..6dff42ca 100644
--- a/charts/apps/templates/opa-app.yaml
+++ b/charts/apps/templates/opa-app.yaml
@@ -2,7 +2,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: opa
+  name: {{ include "common.names.fullname" $ }}-opa
   namespace: {{ .Release.Namespace }}
   finalizers:
     - resources-finalizer.argocd.arogproj.io
diff --git a/charts/apps/templates/openfga-app.yaml b/charts/apps/templates/openfga-app.yaml
new file mode 100644
index 00000000..ae195a90
--- /dev/null
+++ b/charts/apps/templates/openfga-app.yaml
@@ -0,0 +1,28 @@
+{{ if .Values.openfga.enabled }}
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: {{ include "common.names.fullname" $ }}-openfga
+  namespace: {{ .Release.Namespace }}
+  finalizers:
+    - resources-finalizer.argocd.arogproj.io
+spec:
+  project: {{ default .Release.Namespace .Values.project }}
+  source:
+    repoURL: https://openfga.github.io/helm-charts
+    targetRevision: {{ .Values.openfga.targetRevision | quote }}
+    chart: openfga
+    {{- if .Values.openfga.valuesObject }}
+    helm:
+      valuesObject:
+          {{ .Values.openfga.valuesObject | toYaml | nindent 10 }}
+    {{- end }}
+  destination:
+    name: {{ .Values.destination.name }}
+    server: {{ .Values.destination.server }}
+    namespace: {{ default .Release.Namespace .Values.destination.namespace }}
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+{{- end }}
diff --git a/charts/apps/values.yaml b/charts/apps/values.yaml
index 32faecea..80688a56 100644
--- a/charts/apps/values.yaml
+++ b/charts/apps/values.yaml
@@ -33,3 +33,8 @@ opa:
           paths:
             - path: /
               pathType: Prefix
+
+openfga:
+  enabled: true
+  targetRevision: '*'
+  valuesObject: {}