diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml
index a6b0c56..b489173 100644
--- a/badhouseplants/helmfile.yaml
+++ b/badhouseplants/helmfile.yaml
@@ -27,6 +27,11 @@ releases:
     namespace: gitea-service
     createNamespace: false
 
+  - <<: *funkwhale
+    installed: true
+    namespace: funkwhale-application
+    createNamespace: false
+
 bases:
   - ../environments.yaml
   - ../repositories.yaml
diff --git a/badhouseplants/values/secrets.funkwhale.yaml b/badhouseplants/values/secrets.funkwhale.yaml
new file mode 100644
index 0000000..712cfdf
--- /dev/null
+++ b/badhouseplants/values/secrets.funkwhale.yaml
@@ -0,0 +1,25 @@
+postgresql:
+    auth:
+        username: ENC[AES256_GCM,data:S09SpdX3ro0S,iv:QYQiF8Ozz9iLElqsoxyika+iVcHzRyo4hhaaIw8/vDM=,tag:KzorD+/Pysqwm5PneRRsyg==,type:str]
+        password: ENC[AES256_GCM,data:R6bqME1FH72K,iv:PuOIgStSM/NvwhQj06E/PMtB30aDbstypIBt84Fh1q0=,tag:gzv9S+hYW6qjgdoMhl1mTw==,type:str]
+        database: ENC[AES256_GCM,data:Ld33SGYZdlK+,iv:hZ/DlO3wNQ7Bm5L3RmNDzOp9U4QBr+nhJbDD1XYc56Y=,tag:NIgpN71+dL1jIgG66l+3VA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRL0l4OHh5TTd1UGoxZFcw
+            TUtNYkdYTzhRS3hpTHkyNlhoT2hTek54RlJnCktpZmpDNk9mYThyUVZOUTAvanBL
+            VElHYjR6T2QrV3N2c08vZ3JHVWdjSHMKLS0tIE5nREIyVlJ1d29UVzE2aFl2Q21Y
+            dWdMUFpOOVJYSXdBbzJiSzhQM0VmbWMKUqdIpfa8i7vASIga8HFurrPf1RgA+WVA
+            GZiG+M0i4yc3SooTIwbDzH0orfaEHueKdNTGOXMgxNiRIt2q9BG76g==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2023-02-21T14:05:30Z"
+    mac: ENC[AES256_GCM,data:gt+reA0ZXvsTCbRFDcDDpu/DYZAeEuS1XYAK2H/t3VudIxHcPSNYeQeOwpZ4ziOoX0DbSeci8jTXOSmqhI3R+g5ENS3KL9jw+9e+7znzvc9Y0esNVhqSJZCxDhAlrxW6th1fYdFQ43QHyQsK8HXafh9DO2qMmam5Kf0zxO6RpFM=,iv:Xdk1s1Sx/lIpHulkWD1JJWw/Rhs9aP3MC8uRKtCrSQ8=,tag:E2qFvcr4pmJ98I1ci6iFSw==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.7.3
diff --git a/badhouseplants/values/values.funkwhale.yaml b/badhouseplants/values/values.funkwhale.yaml
new file mode 100644
index 0000000..e6a36db
--- /dev/null
+++ b/badhouseplants/values/values.funkwhale.yaml
@@ -0,0 +1,24 @@
+replicaCount: 1
+worker: 
+  replicaCount: 1
+celery:
+  beat:
+    resources:
+      limits:
+        cpu: 100m
+        memory: 512Mi
+      requests:
+        cpu: 10m
+        memory: 75Mi
+extraEnv:
+  FUNKWHALE_HOSTNAME: funkwhale.badhouseplants.net
+  FUNKWHALE_PROTOCOL: https
+persistence:
+  enabled: true
+  accessMode: ReadWriteMany
+  size: 10Gi
+s3:
+  enabled: false
+ingress:
+  enabled: false
+
diff --git a/releases.yaml b/releases.yaml
index f41eecb..39685cc 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -133,4 +133,13 @@ templates:
     version: 7.0.2
     inherit: 
       - template: default-env-values
-      - template: default-env-secrets
\ No newline at end of file
+      - template: default-env-secrets
+
+  funkwhale: &funkwhale
+    name: funkwhale
+    chart: ananace/funkwhale
+    version: 1.0.0
+    inherit: 
+      - template: default-env-values
+      - template: default-env-secrets
+