diff --git a/apps/base/podinfo/kustomization.yaml b/apps/base/podinfo/kustomization.yaml
new file mode 100644
index 0000000..74e7370
--- /dev/null
+++ b/apps/base/podinfo/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - repository.yaml
+  - release.yaml
diff --git a/apps/base/podinfo/release.yaml b/apps/base/podinfo/release.yaml
new file mode 100644
index 0000000..49d902d
--- /dev/null
+++ b/apps/base/podinfo/release.yaml
@@ -0,0 +1,21 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: podinfo
+spec:
+  targetNamespace: podinfo
+  releaseName: podinfo
+  chart:
+    spec:
+      chart: podinfo
+      sourceRef:
+        kind: HelmRepository
+        name: podinfo
+  interval: 50m
+  install:
+    remediation:
+      retries: 3
+  # Default values
+  # https://github.com/stefanprodan/podinfo/blob/master/charts/podinfo/values.yaml
+  values:
+    replicaCount: 1
diff --git a/apps/base/podinfo/repository.yaml b/apps/base/podinfo/repository.yaml
new file mode 100644
index 0000000..623423c
--- /dev/null
+++ b/apps/base/podinfo/repository.yaml
@@ -0,0 +1,8 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: podinfo
+spec:
+  interval: 12h
+  type: oci
+  url: oci://ghcr.io/stefanprodan/charts
diff --git a/apps/production/kustomization.yaml b/apps/production/kustomization.yaml
new file mode 100644
index 0000000..c7c4eb1
--- /dev/null
+++ b/apps/production/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../base/podinfo
+patches:
+  - path: podinfo-values.yaml
+    target:
+      kind: HelmRelease
diff --git a/apps/production/podinfo-values.yaml b/apps/production/podinfo-values.yaml
new file mode 100644
index 0000000..ec16998
--- /dev/null
+++ b/apps/production/podinfo-values.yaml
@@ -0,0 +1,13 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: podinfo
+  namespace: podinfo
+spec:
+  chart:
+    spec:
+      version: ">=1.0.0"
+  test:
+    enable: false
+  values:
+    replicaCount: 2
diff --git a/apps/staging/kustomization.yaml b/apps/staging/kustomization.yaml
new file mode 100644
index 0000000..c7c4eb1
--- /dev/null
+++ b/apps/staging/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../base/podinfo
+patches:
+  - path: podinfo-values.yaml
+    target:
+      kind: HelmRelease
diff --git a/apps/staging/podinfo-values.yaml b/apps/staging/podinfo-values.yaml
new file mode 100644
index 0000000..bfd6670
--- /dev/null
+++ b/apps/staging/podinfo-values.yaml
@@ -0,0 +1,13 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: podinfo
+  namespace: podinfo
+spec:
+  chart:
+    spec:
+      version: ">=1.0.0-alpha"
+  test:
+    enable: false
+  values:
+    replicaCount: 2
diff --git a/clusters/staging/releases/kustomization.yaml b/clusters/staging/releases/kustomization.yaml
new file mode 100644
index 0000000..ed44b6c
--- /dev/null
+++ b/clusters/staging/releases/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../apps/staging
diff --git a/clusters/staging/tenants/podinfo.yaml b/clusters/staging/tenants/podinfo.yaml
index 5128776..c449b76 100644
--- a/clusters/staging/tenants/podinfo.yaml
+++ b/clusters/staging/tenants/podinfo.yaml
@@ -2,3 +2,5 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: podinfo
+  labels:
+    toolkit.fluxcd.io/tenant: dev-team
diff --git a/hub/staging.yaml b/hub/staging.yaml
index d125b10..889fe47 100644
--- a/hub/staging.yaml
+++ b/hub/staging.yaml
@@ -29,6 +29,7 @@ metadata:
   name: releases-sync
   namespace: staging
 spec:
+  targetNamespace: staging
   interval: 1h
   retryInterval: 3m
   timeout: 5m