diff --git a/kubernetes/apps/default/kustomization.yaml b/kubernetes/apps/default/kustomization.yaml
index ce2ef307..95807ff8 100644
--- a/kubernetes/apps/default/kustomization.yaml
+++ b/kubernetes/apps/default/kustomization.yaml
@@ -14,4 +14,5 @@ resources:
   - ./redis/ks.yaml
   - ./radarr/ks.yaml
   - ./sabnzbd/ks.yaml
+  - ./samba/ks.yaml
   - ./sonarr/ks.yaml
diff --git a/kubernetes/apps/default/samba/app/helmrelease.yaml b/kubernetes/apps/default/samba/app/helmrelease.yaml
new file mode 100644
index 00000000..dd7e7288
--- /dev/null
+++ b/kubernetes/apps/default/samba/app/helmrelease.yaml
@@ -0,0 +1,55 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/helmrelease_v2beta1.json
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: samba
+  namespace: default
+spec:
+  interval: 15m
+  chart:
+    spec:
+      chart: app-template
+      version: 0.0.12
+      sourceRef:
+        kind: HelmRepository
+        name: freekingdean
+        namespace: flux-system
+  maxHistory: 3
+  install:
+    createNamespace: true
+    remediation:
+      retries: 3
+  upgrade:
+    cleanupOnFail: true
+    remediation:
+      retries: 3
+  uninstall:
+    keepHistory: false
+  values:
+    stateful: true
+    defaultPodOptions:
+      securityContext:
+        runAsUser: 0
+        runAsGroup: 0
+        fsGroup: 0
+        fsGroupChangePolicy: "OnRootMismatch"
+        supplementalGroups: [10000]
+    persistence:
+      media:
+        existingClaim: media
+        type: persistentVolumeClaim
+    image:
+      repository: dperson/samba
+      tag: latest
+    env:
+      TZ: America/New_York
+      SHARE: media;/media
+      SMB: "true"
+    loadbalanced: true
+    ports:
+      http: 445
+    ingress:
+      enabled: false
+    serviceMonitor:
+      enabled: false
diff --git a/kubernetes/apps/default/samba/app/kustomization.yaml b/kubernetes/apps/default/samba/app/kustomization.yaml
new file mode 100644
index 00000000..a87397c2
--- /dev/null
+++ b/kubernetes/apps/default/samba/app/kustomization.yaml
@@ -0,0 +1,11 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: default
+resources:
+  - ./helmrelease.yaml
+labels:
+  - pairs:
+      app.kubernetes.io/name: samba
+      app.kubernetes.io/instance: samba
diff --git a/kubernetes/apps/default/samba/ks.yaml b/kubernetes/apps/default/samba/ks.yaml
new file mode 100644
index 00000000..adb8c2b9
--- /dev/null
+++ b/kubernetes/apps/default/samba/ks.yaml
@@ -0,0 +1,18 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/kustomization_v1beta2.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: cluster-apps-samba
+  namespace: flux-system
+spec:
+  dependsOn:
+    - name: cluster-apps-media
+  path: ./kubernetes/apps/default/samba/app
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: home-kubernetes
+  interval: 30m
+  retryInterval: 1m
+  timeout: 3m