diff --git a/kubernetes/apps/podinfo/namespace.yaml b/kubernetes/apps/podinfo/namespace.yaml
new file mode 100644
index 0000000..d7f8518
--- /dev/null
+++ b/kubernetes/apps/podinfo/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: podinfo
+  labels:
+    toolkit.fluxcd.io/tenant: dev-team
\ No newline at end of file
diff --git a/kubernetes/apps/podinfo/podinfo.yaml b/kubernetes/apps/podinfo/podinfo.yaml
index 04b6eb0..d6547a1 100644
--- a/kubernetes/apps/podinfo/podinfo.yaml
+++ b/kubernetes/apps/podinfo/podinfo.yaml
@@ -1,14 +1,3 @@
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: GitRepository
-metadata:
-  name: podinfo
-  namespace: podinfo
-spec:
-  interval: 5m
-  url: https://github.com/stefanprodan/podinfo
-  ref:
-    branch: master
----
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
@@ -22,6 +11,6 @@ spec:
   sourceRef:
     kind: GitRepository
     name: podinfo
-  targetNamespace: default
+  targetNamespace: podinfo
   timeout: 3m0s
   wait: true
diff --git a/kubernetes/apps/podinfo/release.yaml b/kubernetes/apps/podinfo/release.yaml
new file mode 100644
index 0000000..5f2f500
--- /dev/null
+++ b/kubernetes/apps/podinfo/release.yaml
@@ -0,0 +1,27 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: podinfo
+  namespace: podinfo
+spec:
+  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:
+    redis:
+      enabled: true
+      repository: public.ecr.aws/docker/library/redis
+      tag: 7.0.6
+    ingress:
+      enabled: true
+      className: nginx
\ No newline at end of file
diff --git a/kubernetes/apps/podinfo/repository.yaml b/kubernetes/apps/podinfo/repository.yaml
new file mode 100644
index 0000000..b3b0730
--- /dev/null
+++ b/kubernetes/apps/podinfo/repository.yaml
@@ -0,0 +1,8 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: podinfo
+  namespace: podinfo
+spec:
+  interval: 5m
+  url: https://stefanprodan.github.io/podinfo
\ No newline at end of file