diff --git a/grott-current/config.json b/grott-current/config.json
deleted file mode 100644
index c341107..0000000
--- a/grott-current/config.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "name": "Grott edge - Home Assistant native MQTT integration - current",
-  "version": "b6f2f24",
-  "slug": "grott-current",
-  "description": "The Growatt inverter monitor with current HA plugin integrated",
-  "url": "https://github.com/egguy/addon-grott",
-  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
-  "codenotary": "etienne.guilluy@gmail.com",
-  "services": ["mqtt:need"],
-  "init": false,
-  "map": ["config:rw"],
-  "ports": {
-    "5279/tcp": 5279
-  },
-  "ports_description": {
-    "5279/tcp": "The port used by grott to receive the data of the logger"
-  },
-  "options": {
-    "data_path": "/config/grott",
-    "gmode": "proxy",
-    "grott_mqtt": false,
-    "ginvtype": "default",
-    "ginvtypemap": "",
-    "retain": false,
-    "verbose": false,
-    "ha_plugin": true,
-    "mqtt": {}
-  },
-  "schema": {
-    "gblockcmd": "bool?",
-    "gcompat": "bool?",
-    "gdecrypt": "bool?",
-    "gextension": "bool?",
-    "gextname": "str?",
-    "gextvar": "str?",
-    "ggrottip": "str?",
-    "ggrottport": "port?",
-    "ggrowattip": "str?",
-    "ggrowattport": "port?",
-    "gifbucket": "str?",
-    "gifdbname": "str?",
-    "gifip": "str?",
-    "giforg": "str?",
-    "gifpassword": "password?",
-    "gifport": "port?",
-    "giftoken": "str?",
-    "gifuser": "str?",
-    "gincludeall": "bool?",
-    "ginflux": "bool?",
-    "ginflux2": "bool?",
-    "ginverterid": "str?",
-    "ginvtype": "str?",
-    "ginvtypemap": "str?",
-    "gminrecl": "int?",
-    "gmode": "str",
-    "gmqttauth": "bool?",
-    "gmqttinverterintopic": "bool?",
-    "gmqttip": "str?",
-    "gmqttpassword": "password?",
-    "gmqttport": "str?",
-    "gmqtttopic": "str?",
-    "gmqttuser": "str?",
-    "gnoipf": "bool?",
-    "grott_mqtt": "bool?",
-    "gpvapikey": "str?",
-    "gpvdisv1": "bool?",
-    "gpvinverters": "int?",
-    "gpvoutput": "bool?",
-    "gpvsystemid": "int?",
-    "gpvtemp": "bool?",
-    "gsendbuf": "bool?",
-    "gtime": "str?",
-    "gtimezone": "str?",
-    "gvalueoffset": "int?",
-    "verbose": "bool",
-    "retain": "bool",
-    "ha_plugin": "bool",
-    "mqtt": {
-      "host": "str?",
-      "port": "int?",
-      "user": "str?",
-      "password": "str?"
-    },
-    "data_path": "str"
-  },
-  "image": "egguy/addon-{arch}-grott-ha-addon-edge"
-}
diff --git a/grott-current/config.yaml b/grott-current/config.yaml
new file mode 100644
index 0000000..37a6723
--- /dev/null
+++ b/grott-current/config.yaml
@@ -0,0 +1,86 @@
+---
+name: grott
+version: b6f2f24
+slug: grott
+description: The Growatt inverter monitor with current HA plugin integrated
+url: https://github.com/egguy/addon-grott
+arch:
+  - armhf
+  - armv7
+  - aarch64
+  - amd64
+  - i386
+services:
+  - mqtt:need
+init: false
+map:
+  - config:rw
+ports:
+  5279/tcp: 5279
+ports_description:
+  5279/tcp: The port used by grott to receive the data of the logger
+options:
+  data_path: /config/grott
+  gmode: proxy
+  grott_mqtt: false
+  ginvtype: default
+  ginvtypemap: ""
+  retain: false
+  verbose: false
+  ha_plugin: true
+  mqtt: {}
+schema:
+  gblockcmd: bool?
+  gcompat: bool?
+  gdecrypt: bool?
+  gextension: bool?
+  gextname: str?
+  gextvar: str?
+  ggrottip: str?
+  ggrottport: port?
+  ggrowattip: str?
+  ggrowattport: port?
+  gifbucket: str?
+  gifdbname: str?
+  gifip: str?
+  giforg: str?
+  gifpassword: password?
+  gifport: port?
+  giftoken: str?
+  gifuser: str?
+  gincludeall: bool?
+  ginflux: bool?
+  ginflux2: bool?
+  ginverterid: str?
+  ginvtype: str?
+  ginvtypemap: str?
+  gminrecl: int?
+  gmode: str
+  gmqttauth: bool?
+  gmqttinverterintopic: bool?
+  gmqttip: str?
+  gmqttpassword: password?
+  gmqttport: str?
+  gmqtttopic: str?
+  gmqttuser: str?
+  gnoipf: bool?
+  grott_mqtt: bool?
+  gpvapikey: str?
+  gpvdisv1: bool?
+  gpvinverters: int?
+  gpvoutput: bool?
+  gpvsystemid: int?
+  gpvtemp: bool?
+  gsendbuf: bool?
+  gtime: str?
+  gtimezone: str?
+  gvalueoffset: int?
+  verbose: bool
+  retain: bool
+  ha_plugin: bool
+  mqtt:
+    host: str?
+    port: int?
+    user: str?
+    password: str?
+  data_path: str