diff --git a/_argocd/apps/logging.yaml b/_argocd/apps/logging.yaml
new file mode 100644
index 0000000..d395459
--- /dev/null
+++ b/_argocd/apps/logging.yaml
@@ -0,0 +1,22 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: logging
+  namespace: argocd
+spec:
+  destination:
+    namespace: logging
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    path: cluster-components/logging
+    repoURL: https://gitlab.mareshq.com/gitops/mareshq/bee.git
+    targetRevision: HEAD
+    helm:
+      skipCrds: true
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/cluster-components/logging/Chart.lock b/cluster-components/logging/Chart.lock
new file mode 100644
index 0000000..652706a
--- /dev/null
+++ b/cluster-components/logging/Chart.lock
@@ -0,0 +1,9 @@
+dependencies:
+- name: promtail
+  repository: https://grafana.github.io/helm-charts
+  version: 6.3.0
+- name: loki
+  repository: https://grafana.github.io/helm-charts
+  version: 3.0.1
+digest: sha256:e4b0771d0c738fe26c8770cdd6fbc564c31b69b052516de22e4604ee6f2bcb3b
+generated: "2022-09-08T16:03:37.238201+02:00"
diff --git a/cluster-components/logging/Chart.yaml b/cluster-components/logging/Chart.yaml
new file mode 100644
index 0000000..45110c4
--- /dev/null
+++ b/cluster-components/logging/Chart.yaml
@@ -0,0 +1,14 @@
+apiVersion: v2
+name: logging
+description: A Helm chart for Kubernetes
+type: application
+version: 0.1.0
+appVersion: "1.0"
+
+dependencies:
+- name: promtail
+  version: 6.3.0
+  repository: https://grafana.github.io/helm-charts
+- name: loki
+  version: 3.0.1
+  repository: https://grafana.github.io/helm-charts
diff --git a/cluster-components/logging/values.yaml b/cluster-components/logging/values.yaml
new file mode 100644
index 0000000..fe14b2c
--- /dev/null
+++ b/cluster-components/logging/values.yaml
@@ -0,0 +1,27 @@
+promtail:
+  fullnameOverride: promtail
+
+loki:
+  fullnameOverride: loki
+
+  write:
+    persistence:
+      size: 20Gi
+      storageClass: longhorn
+
+  read:
+    persistence:
+      size: 20Gi
+      storageClass: longhorn
+
+  singleBinary:
+    persistence:
+      storageClass: longhorn
+
+  monitoring:
+    # Do not collect the logs of Loki inside Loki
+    selfMonitoring:
+      enabled: false
+
+      grafanaAgent:
+        installOperator: false