diff --git a/clusters/base/apps/baikal/helmrelease.yaml b/clusters/base/apps/baikal/helmrelease.yaml
new file mode 100644
index 0000000..28c8367
--- /dev/null
+++ b/clusters/base/apps/baikal/helmrelease.yaml
@@ -0,0 +1,63 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: baikal
+  namespace: pim
+spec:
+  interval: 10m
+  chartRef:
+    kind: OCIRepository
+    name: baikal
+  driftDetection:
+    mode: enabled
+  values:
+    controllers:
+      app:
+        containers:
+          app:
+            image:
+              repository: ckulka/baikal
+              tag: nginx
+            probes:
+              liveness:
+                enabled: true
+              readiness:
+                enabled: true
+
+    service:
+      app:
+        controller: app
+        ports:
+          http:
+            port: 80
+
+    ingress:
+      app:
+        className: traefik
+        annotations:
+          cert-manager.io/cluster-issuer: letsencrypt-prod
+        hosts:
+          - host: c2.aggtaa.com
+            paths:
+              - path: /
+                pathType: Prefix
+                service:
+                  identifier: app
+                  port: http
+        tls:
+          - secretName: baikal-tls
+            hosts:
+              - c2.aggtaa.com
+
+    persistence:
+      data:
+        type: persistentVolumeClaim
+        accessMode: ReadWriteOnce
+        size: 1Gi
+        storageClass: longhorn
+        retain: true
+        globalMounts:
+          - path: /var/www/baikal/config
+            subPath: config
+          - path: /var/www/baikal/Specific
+            subPath: specific
diff --git a/clusters/base/apps/baikal/helmrepository.yaml b/clusters/base/apps/baikal/helmrepository.yaml
new file mode 100644
index 0000000..704cd9d
--- /dev/null
+++ b/clusters/base/apps/baikal/helmrepository.yaml
@@ -0,0 +1,10 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: baikal
+  namespace: pim
+spec:
+  interval: 10m
+  url: oci://ghcr.io/bjw-s-labs/helm/app-template
+  ref:
+    tag: "5.0.1"
diff --git a/clusters/base/apps/baikal/kustomization.yaml b/clusters/base/apps/baikal/kustomization.yaml
new file mode 100644
index 0000000..d7fbb03
--- /dev/null
+++ b/clusters/base/apps/baikal/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - helmrepository.yaml
+  - helmrelease.yaml
diff --git a/clusters/home/apps/baikal.yaml b/clusters/home/apps/baikal.yaml
new file mode 100644
index 0000000..5c34f75
--- /dev/null
+++ b/clusters/home/apps/baikal.yaml
@@ -0,0 +1,17 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: baikal
+  namespace: flux-system
+spec:
+  interval: 10m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./clusters/base/apps/baikal
+  prune: true
+  wait: true
+  dependsOn:
+    - name: namespaces
+    - name: infra
+  retryInterval: 5s
diff --git a/clusters/home/apps/kustomization.yaml b/clusters/home/apps/kustomization.yaml
index 32dd132..ba7074e 100644
--- a/clusters/home/apps/kustomization.yaml
+++ b/clusters/home/apps/kustomization.yaml
@@ -1,6 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+  - baikal.yaml
   - vaultwarden.yaml
   - zigbee2mqtt.yaml
   - radicale.yaml