diff --git a/apps/authelia/kustomization.yaml b/apps/authelia/kustomization.yaml
new file mode 100644
index 0000000..838eb25
--- /dev/null
+++ b/apps/authelia/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: authelia
+resources:
+  - ./namespace.yaml
+  - ./repository.yaml
+  - ./release.yaml
+
+components:
+  - ../../common/postgres
+  - ../../common/dragonflydb
diff --git a/apps/authelia/namespace.yaml b/apps/authelia/namespace.yaml
new file mode 100644
index 0000000..6c48a0b
--- /dev/null
+++ b/apps/authelia/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: authelia
diff --git a/apps/authelia/release.yaml b/apps/authelia/release.yaml
new file mode 100644
index 0000000..bcc80f9
--- /dev/null
+++ b/apps/authelia/release.yaml
@@ -0,0 +1,55 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: authelia
+spec:
+  chart:
+    spec:
+      chart: authelia
+      reconcileStrategy: ChartVersion
+      sourceRef:
+        kind: HelmRepository
+        name: authelia
+      version: 0.9.9
+  interval: 15m
+  values:
+    ingress:
+      enabled: true
+      tls:
+        enabled: true
+        secret: huizinga-dev-tls
+      traefikCRD:
+        enabled: true
+        entryPoints:
+          - websecure
+    configMap:
+      authentication_backend:
+        ldap:
+          enabled: true
+          implementation: custom
+          address: ldap://lldap.lldap.svc.cluster.local:3890
+          base_dn: dc=huizinga,dc=dev
+          additional_users_dn: ou=people
+          users_filter: "(&({username_attribute}={input})(objectClass=person))"
+          additional_groups_dn: ou=groups
+          groups_filter: "(member={dn})"
+          attributes:
+            display_name: displayName
+            username: uid
+            group_name: cn
+            mail: mail
+          user: uid=authelia,ou=people,dc=huizinga,dc=dev
+          password:
+            value: "JustATest"
+      session:
+        cookies:
+          - subdomain: login
+            domain: huizinga.dev
+
+      # Just for testing
+      storage:
+        local:
+          enabled: true
+      notifier:
+        filesystem:
+          enabled: true
diff --git a/apps/authelia/repository.yaml b/apps/authelia/repository.yaml
new file mode 100644
index 0000000..e23739f
--- /dev/null
+++ b/apps/authelia/repository.yaml
@@ -0,0 +1,7 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: authelia
+spec:
+  interval: 15m
+  url: https://charts.authelia.com
diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml
index 3aec774..ce3d8d7 100644
--- a/apps/kustomization.yaml
+++ b/apps/kustomization.yaml
@@ -3,4 +3,5 @@ kind: Kustomization
 resources:
   - ./traefik-dashboard
   - ./lldap
+  - ./authelia
   - ./whoami.yaml
diff --git a/infrastructure/configs/dragonflydb.yaml b/common/dragonflydb/database.yaml
similarity index 73%
rename from infrastructure/configs/dragonflydb.yaml
rename to common/dragonflydb/database.yaml
index 254d4fc..b16056d 100644
--- a/infrastructure/configs/dragonflydb.yaml
+++ b/common/dragonflydb/database.yaml
@@ -1,15 +1,9 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: dragonflydb
----
 apiVersion: dragonflydb.io/v1alpha1
 kind: Dragonfly
 metadata:
   labels:
     app: dragonflydb
   name: dragonflydb
-  namespace: dragonflydb
 spec:
   replicas: 1
   resources:
diff --git a/common/dragonflydb/kustomization.yaml b/common/dragonflydb/kustomization.yaml
new file mode 100644
index 0000000..ad6a7bb
--- /dev/null
+++ b/common/dragonflydb/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+resources:
+  - ./database.yaml
diff --git a/infrastructure/configs/kustomization.yaml b/infrastructure/configs/kustomization.yaml
index 56ff79d..dd728e4 100644
--- a/infrastructure/configs/kustomization.yaml
+++ b/infrastructure/configs/kustomization.yaml
@@ -8,4 +8,3 @@ resources:
 
   - ./akri-devices.yaml
   - ./intel-devices.yaml
-  - ./dragonflydb.yaml