diff --git a/apps/faf-lobby-server/Chart.yaml b/apps/faf-lobby-server/Chart.yaml
index d9e6ccae..584bd191 100644
--- a/apps/faf-lobby-server/Chart.yaml
+++ b/apps/faf-lobby-server/Chart.yaml
@@ -1,3 +1,3 @@
 apiVersion: v2
-name: faf-java-api
+name: faf-lobby-server
 version: 1.0.0
diff --git a/apps/faf-qai/Chart.yaml b/apps/faf-qai/Chart.yaml
new file mode 100644
index 00000000..dca29fb5
--- /dev/null
+++ b/apps/faf-qai/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: faf-qai
+version: 1.0.0
diff --git a/apps/faf-qai/templates/config.yaml b/apps/faf-qai/templates/config.yaml
new file mode 100644
index 00000000..cba4cb1f
--- /dev/null
+++ b/apps/faf-qai/templates/config.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: faf-qai
+  labels:
+    app: faf-qai
+data:
+  IRC_SERVER: irc.{{ .Values.baseDomain }}
+  IRC_USER: qai
+  CONFIG__HOST: {{ .Values.baseDomain }}
+  FAFAPI_CLIENT_ID: faf-qai
\ No newline at end of file
diff --git a/apps/faf-qai/templates/deployment.yaml b/apps/faf-qai/templates/deployment.yaml
new file mode 100644
index 00000000..9c611852
--- /dev/null
+++ b/apps/faf-qai/templates/deployment.yaml
@@ -0,0 +1,35 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: faf-qai
+  labels:
+    app: faf-qai
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: faf-qai
+  template:
+    metadata:
+      labels:
+        app: faf-qai
+    spec:
+      containers:
+        - image: faforever/faf-qai:main
+          imagePullPolicy: Always
+          name: faf-qai
+          envFrom:
+            - configMapRef:
+                name: faf-qai
+            - secretRef:
+                name: faf-qai
+          volumeMounts:
+            - mountPath: /app/Database
+              name: faf-qai
+              subPath: "Database"
+      restartPolicy: Always
+      volumes:
+        - name: faf-qai
+          persistentVolumeClaim:
+            claimName: faf-qai-pvc
\ No newline at end of file
diff --git a/apps/faf-qai/templates/secret.yaml b/apps/faf-qai/templates/secret.yaml
new file mode 100644
index 00000000..97785c3d
--- /dev/null
+++ b/apps/faf-qai/templates/secret.yaml
@@ -0,0 +1,18 @@
+apiVersion: secrets.infisical.com/v1alpha1
+kind: InfisicalSecret
+metadata:
+  name: faf-qai
+  namespace: faf-apps
+spec:
+  authentication:
+    serviceToken:
+      serviceTokenSecretReference:
+        secretName: infisical-service-token
+        secretNamespace: faf-apps
+      secretsScope:
+        envSlug: {{.Values.infisicalSlug}}
+        secretsPath: "/faf-qai"
+  managedSecretReference:
+    secretName: faf-qai
+    secretNamespace: faf-apps
+    creationPolicy: "Owner"
diff --git a/cluster/storage/values.yaml b/cluster/storage/values.yaml
index f7c6068f..f21e8074 100644
--- a/cluster/storage/values.yaml
+++ b/cluster/storage/values.yaml
@@ -63,6 +63,11 @@ managedStorages:
       size: 1Gi
     pvc:
       namespace: faf-apps
+  - pv:
+      name: faf-qai
+      size: 1Gi
+    pvc:
+      namespace: faf-apps
 #  - name: mariadb
 #    namespace: faf-apps
 #    size: 20Gi