diff --git a/servapps/HA_enoceanmqtt/cosmos-compose.json b/servapps/HA_enoceanmqtt/cosmos-compose.json
new file mode 100644
index 00000000..455a1978
--- /dev/null
+++ b/servapps/HA_enoceanmqtt/cosmos-compose.json
@@ -0,0 +1,108 @@
+{ 
+  "cosmos-installer": {
+    "form": [
+      {
+        "name": "adminOnly",
+        "label": "Do you want to make this service admin only?",
+        "initialValue": false,
+        "type": "checkbox"
+      }
+    ],
+    "translation": {
+      "de": {
+        "form.adminOnly.label": "Möchten Sie diesen Dienst nur für Administratoren zugänglich machen?"
+      }
+    }
+  },
+  "minVersion": "0.8.0",
+  "services": {
+    "{ServiceName}": {
+      "container_name": "{ServiceName}",
+      "labels": {
+        "cosmos-force-network-secured": "true",
+        "cosmos-auto-update": "true"
+      },
+      "image": "ghcr.io/aseracorp/ha_enoceanmqtt",
+      "restart": "unless-stopped",
+      "volumes": [
+        {
+          "source": "{ServiceName}-config",
+          "target": "/config",
+          "type": "volume"
+        }
+      ],
+      "devices": [
+        "/dev/ttyUSB0:/dev/enocean:rwm"
+      ],
+      "UID": 1000,
+      "GID": 1000,
+      "environment": [
+        "PUID=1000",
+        "PGID=1000",
+        "TZ=Europe/Zurich"
+      ],
+      "links": [
+        "Home-Assistant"
+      ]
+    },
+    "{ServiceName}-Filebrowser": {
+      "image": "filebrowser/filebrowser:s6",
+      "container_name": "{ServiceName}-Filebrowser",
+      "restart": "unless-stopped",
+      "tty": true,
+      "stdin_open": true,
+      "UID": 1000,
+      "GID": 1000,
+      "environment": [
+        "PUID=1000",
+        "PGID=1000",
+        "TZ=auto",
+        "FB_NOAUTH=true"
+      ],
+      "post_install": [
+        "filebrowser config init",
+        "filebrowser users add admin admin"
+      ],
+      "labels": {
+        "cosmos-force-network-secured": "true",
+        "cosmos-auto-update": "true"
+      },
+      "volumes": [
+        {
+          "source": "{ServiceName}-config",
+          "target": "/srv",
+          "type": "volume"
+        },
+        {
+          "source": "Filebrowser-database",
+          "target": "/database",
+          "type": "volume"
+        },
+        {
+          "source": "Filebrowser-config",
+          "target": "/config",
+          "type": "volume"
+        }
+      ],
+      "routes": [
+        {
+          "name": "{ServiceName}-Filebrowser",
+          "description": "Expose {ServiceName}-Filebrowser to the web (WARNING: has to be free / different than the above)",
+          "useHost": true,
+          "target": "http://{ServiceName}-Filebrowser:80",
+          "mode": "SERVAPP",
+          "Timeout": 14400000,
+          "ThrottlePerMinute": 12000,
+          "BlockCommonBots": true,
+          "SmartShield": {
+            "Enabled": true
+          },
+          "AuthEnabled": true
+          {if Context.codeServerAdminOnly}
+          , "AuthAdmin": true
+          {/if}
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/servapps/HA_enoceanmqtt/description.json b/servapps/HA_enoceanmqtt/description.json
new file mode 100644
index 00000000..040c2964
--- /dev/null
+++ b/servapps/HA_enoceanmqtt/description.json
@@ -0,0 +1,15 @@
+{
+  "name": "HA_enoceanmqtt",
+  "description": "This is a Home Assistant overlay for enoceanmqtt.",
+  "longDescription": "<p>It allows to easily have access to EnOcean devices in Home Assistant through MQTT.<br/>It is based on MQTT discovery from the Home Assistant MQTT integration.</p>",
+  "translation": {
+    "de": {
+      "description": "Dies ist ein Home Assistant Overlay für enoceanmqtt.",
+      "longDescription": "<p>Es ermöglicht den einfachen Zugriff auf EnOcean-Geräte im Home Assistant über MQTT.<br/>Es basiert auf der MQTT-Erkennung der Home Assistant MQTT-Integration.</p>"
+    }
+  },
+  "tags": ["smart home",  "home automation", "IoT", "Raspberry Pi", "local server", "privacy", "control", "automation", "devices", "services", "home assistant"],
+  "repository": "https://github.com/aseracorp/HA_enoceanmqtt/",
+  "image": "https://ghcr.io/aseracorp/ha_enoceanmqtt",
+  "supported_architectures": ["amd64", "arm64"]
+}
diff --git a/servapps/HA_enoceanmqtt/icon.png b/servapps/HA_enoceanmqtt/icon.png
new file mode 100644
index 00000000..41f89f73
Binary files /dev/null and b/servapps/HA_enoceanmqtt/icon.png differ
diff --git a/servapps/HA_enoceanmqtt/screenshots/1.png b/servapps/HA_enoceanmqtt/screenshots/1.png
new file mode 100644
index 00000000..590dc8ad
Binary files /dev/null and b/servapps/HA_enoceanmqtt/screenshots/1.png differ