diff --git a/docs/services/zigbee2mqtt.md b/docs/services/zigbee2mqtt.md
new file mode 100644
index 000000000..97ba78241
--- /dev/null
+++ b/docs/services/zigbee2mqtt.md
@@ -0,0 +1,28 @@
+# zigbee2mqtt
+
+{%
+   include-markdown "../../src/applications/zigbee2mqtt/README.md"
+   start="<!--description-start-->"
+   end="<!--description-end-->"
+%}
+
+---
+
+{%
+   include-markdown "../../src/applications/zigbee2mqtt/README.md"
+   start="<!--header-start-->"
+   end="<!--header-end-->"
+%}
+
+---
+
+
+## Useful Commands
+
+??? example "Start port forward"
+    {%
+       include-markdown "../../src/applications/zigbee2mqtt/README.md"
+       start="<!--port-forward-start-->"
+       end="<!--port-forward-end-->"
+    %}
+
diff --git a/src/applications/arangodb/README.md b/src/applications/arangodb/README.md
new file mode 100644
index 000000000..095a7df61
--- /dev/null
+++ b/src/applications/arangodb/README.md
@@ -0,0 +1,4 @@
+# arangodb (GraphDB)
+
+[arangodb](https://www.arangodb.com/)
+
diff --git a/src/applications/zigbee2mqtt/README.md b/src/applications/zigbee2mqtt/README.md
new file mode 100644
index 000000000..411d4eeed
--- /dev/null
+++ b/src/applications/zigbee2mqtt/README.md
@@ -0,0 +1,32 @@
+# Zigbee2Mqtt (Zigbee Gateway)
+
+
+
+<!--description-start-->
+Self build Zigbee Gateway, for integrate without Vendor, like Ikea or Philips Hue.
+<!--description-end-->
+
+
+<!--header-start-->
+**Namespace:** `zigbee2mqtt`   
+**Deployment:** [truecharts/zigbee2mqtt](https://github.com/truecharts/charts/blob/master/charts/stable/zigbee2mqtt/values.yaml)  
+**Web:** [Zigbee2Mqtt](https://www.zigbee2mqtt.io/) 
+<!--header-end-->
+
+## User Access
+
+
+
+## Useful Commands
+
+**Port Forward**
+<!--port-forward-start-->
+```sh
+kubectl -n zigbee2mqtt port-forward svc/zigbee2mqtt 10103
+```
+<!--port-forward-end-->
+
+
+
+
+
diff --git a/src/applications/zigbee2mqtt/deploy/argocd/application.yaml b/src/applications/zigbee2mqtt/deploy/argocd/application.yaml
new file mode 100644
index 000000000..73c1385f9
--- /dev/null
+++ b/src/applications/zigbee2mqtt/deploy/argocd/application.yaml
@@ -0,0 +1,44 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: zigbee2mqtt
+spec:
+  destination:
+    name: in-cluster
+    namespace: zigbee2mqtt
+  project: default
+  source:
+    chart: zigbee2mqtt
+    repoURL: https://charts.truecharts.org/
+    targetRevision: 8.0.3
+    helm:
+      releaseName: zigbee2mqtt
+      # https://github.com/arangodb/kube-arangodb/blob/1.2.32/chart/kube-arangodb/values.yaml
+      values: |
+        deviceList:
+          - name: zigbee
+            enabled: true
+            type: device
+            hostPath: /dev/ttyACM0 # /dev/ttyUSB0
+            # readOnly: true
+        securityContext:
+          container:
+            privileged: true
+        workload:
+          main:
+            podSpec:
+              containers:
+                main:
+                  env:
+                    ZIGBEE2MQTT_DATA: "/data"
+                    ZIGBEE2MQTT_CONFIG_FRONTEND_PORT: "{{ .Values.service.main.ports.main.port }}"
+                    # User defined
+                    USE_CUSTOM_CONFIG_FILE: false
+                    # This values are required for the autogenerated file to work.
+                    ZIGBEE2MQTT_CONFIG_EXPIRIMENTAL_NEW_API: true
+                    ZIGBEE2MQTT_CONFIG_PERMIT_JOIN: true
+                    ZIGBEE2MQTT_CONFIG_MQTT_SERVER: "mqtt://192.168.178.23:31883"
+                    ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC: "zigbee2mqtt"
+                    ZIGBEE2MQTT_CONFIG_SERIAL_PORT: "/dev/ttyACM0"
+                    ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER: "ezsp"
+                    ZIGBEE2MQTT_CONFIG_HOMEASSISTANT: true
\ No newline at end of file
diff --git a/src/applications/zigbee2mqtt/deploy/argocd/kustomization.yaml b/src/applications/zigbee2mqtt/deploy/argocd/kustomization.yaml
new file mode 100644
index 000000000..04b2ef65b
--- /dev/null
+++ b/src/applications/zigbee2mqtt/deploy/argocd/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - application.yaml
diff --git a/src/bundles/smart-home/kustomization.yaml b/src/bundles/smart-home/kustomization.yaml
index 16d4c0e86..e71c8a640 100644
--- a/src/bundles/smart-home/kustomization.yaml
+++ b/src/bundles/smart-home/kustomization.yaml
@@ -23,4 +23,5 @@ resources:
   - ../../../src/applications/mosquitto/deploy/argocd
   - ../../../src/applications/esphome/deploy/argocd
   - ../../../src/applications/home-assistant/deploy/argocd
-  - ../../../src/applications/rest980/deploy/argocd
+  # - ../../../src/applications/rest980/deploy/argocd
+  - ../../../src/applications/zigbee2mqtt/deploy/argocd