diff --git a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/addon/addon.xml
index 50c5ea886d9db..89e8b80c37d14 100644
--- a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,7 @@
misc
HomeKit
Exposes openHAB to HomeKit.
+ hybrid
org.openhab.homekit
diff --git a/bundles/org.openhab.io.hueemulation/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.io.hueemulation/src/main/resources/OH-INF/addon/addon.xml
index eb6c469113a9d..3c78c0fbb03e0 100644
--- a/bundles/org.openhab.io.hueemulation/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.io.hueemulation/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,7 @@
misc
Hue Emulation
Exposes openHAB as Hue Devices.
+ local
org.openhab.hueemulation
diff --git a/bundles/org.openhab.io.metrics/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.io.metrics/src/main/resources/OH-INF/addon/addon.xml
index 22d579a05de2a..7858c7947845a 100644
--- a/bundles/org.openhab.io.metrics/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.io.metrics/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,7 @@
misc
Metrics
An additional REST endpoint to retrieve openHAB core metrics.
+ local
org.openhab.metrics
diff --git a/bundles/org.openhab.io.neeo/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.io.neeo/src/main/resources/OH-INF/addon/addon.xml
index 693b8ade8813c..635badb320fc2 100644
--- a/bundles/org.openhab.io.neeo/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.io.neeo/src/main/resources/OH-INF/addon/addon.xml
@@ -5,7 +5,8 @@
misc
Neeo
- An additional REST endpoint to retrieve openHAB core metrics.
+ The openHAB NEEO integration allows mapping of openHAB things/item to a NEEO device/capabilities.
+ local
org.openhab.io.neeo.NeeoService
diff --git a/bundles/org.openhab.io.openhabcloud/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.io.openhabcloud/src/main/resources/OH-INF/addon/addon.xml
index 35fe445aa495c..f4d187f8bb6ba 100644
--- a/bundles/org.openhab.io.openhabcloud/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.io.openhabcloud/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,7 @@
misc
openHAB Cloud
Connects local instance to the openHAB cloud.
+ cloud
org.openhab.openhabcloud
diff --git a/bundles/org.openhab.persistence.dynamodb/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.persistence.dynamodb/src/main/resources/OH-INF/addon/addon.xml
index d501423d6a48d..aa04cd410d1d5 100644
--- a/bundles/org.openhab.persistence.dynamodb/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.persistence.dynamodb/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,7 @@
persistence
DynamoDB persistence
This is the persistence add-on for DynamoDB.
+ cloud
org.openhab.dynamodb
diff --git a/bundles/org.openhab.persistence.influxdb/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.persistence.influxdb/src/main/resources/OH-INF/addon/addon.xml
index c7fb4ee52bb62..06bd192644ad4 100644
--- a/bundles/org.openhab.persistence.influxdb/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.persistence.influxdb/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,7 @@
persistence
InfluxDB persistence
This is the persistence add-on for InfluxDB.
+ local
org.openhab.influxdb
diff --git a/bundles/org.openhab.persistence.jpa/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.persistence.jpa/src/main/resources/OH-INF/addon/addon.xml
index 37839b04c1f16..d23a701759426 100644
--- a/bundles/org.openhab.persistence.jpa/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.persistence.jpa/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,7 @@
persistence
JPA persistence
This is the persistence add-on for JPA.
+ local
org.openhab.jpa
diff --git a/bundles/org.openhab.persistence.mapdb/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.persistence.mapdb/src/main/resources/OH-INF/addon/addon.xml
index c9a9ee0b725a6..5cfca1d3388f6 100644
--- a/bundles/org.openhab.persistence.mapdb/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.persistence.mapdb/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
persistence
MapDB persistence
This is the persistence add-on for MapDB.
+ none
diff --git a/bundles/org.openhab.persistence.mongodb/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.persistence.mongodb/src/main/resources/OH-INF/addon/addon.xml
index 842d4b5ab8acd..f129d25535e79 100644
--- a/bundles/org.openhab.persistence.mongodb/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.persistence.mongodb/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,7 @@
persistence
MongoDB persistence
This is the persistence add-on for MongoDB.
+ local
org.openhab.mongodb
diff --git a/bundles/org.openhab.persistence.rrd4j/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.persistence.rrd4j/src/main/resources/OH-INF/addon/addon.xml
index 44fd4dc92097d..d98570d949e33 100644
--- a/bundles/org.openhab.persistence.rrd4j/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.persistence.rrd4j/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
persistence
RRD4J persistence
This is the persistence add-on for RRD4J.
+ none
diff --git a/bundles/org.openhab.transform.bin2json/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.transform.bin2json/src/main/resources/OH-INF/addon/addon.xml
index e71645bf67390..49a3bddd6778c 100644
--- a/bundles/org.openhab.transform.bin2json/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.transform.bin2json/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
transformation
BIN2JSON transformation
Transforms the input by Java Binary Block Parser syntax.
+ none
diff --git a/bundles/org.openhab.transform.exec/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.transform.exec/src/main/resources/OH-INF/addon/addon.xml
index 1a234f2eaee08..d5e7d8ca2ccb0 100644
--- a/bundles/org.openhab.transform.exec/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.transform.exec/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
transformation
Exec transformation
Transforms an input string with an external program.
+ none
diff --git a/bundles/org.openhab.transform.jinja/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.transform.jinja/src/main/resources/OH-INF/addon/addon.xml
index 03670c7eaf319..9307784e49141 100644
--- a/bundles/org.openhab.transform.jinja/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.transform.jinja/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
transformation
Jinja Transformation
Transforms a value using a jinja template.
+ none
diff --git a/bundles/org.openhab.transform.jsonpath/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.transform.jsonpath/src/main/resources/OH-INF/addon/addon.xml
index a29887d113ade..fbf3d6bd25dac 100644
--- a/bundles/org.openhab.transform.jsonpath/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.transform.jsonpath/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
transformation
JSONPATH transformation
Extracts values from a JSON string using a JSONPATH expression.
+ none
diff --git a/bundles/org.openhab.transform.map/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.transform.map/src/main/resources/OH-INF/addon/addon.xml
index cc793887f5e30..59fe9f87d3189 100644
--- a/bundles/org.openhab.transform.map/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.transform.map/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
transformation
MAP transformation
Transforms the input by mapping it to another string.
+ none
diff --git a/bundles/org.openhab.transform.regex/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.transform.regex/src/main/resources/OH-INF/addon/addon.xml
index 4f114a00b7184..57757200ad75c 100644
--- a/bundles/org.openhab.transform.regex/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.transform.regex/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
transformation
Regex transformation
Transforms a source string on basis of the regular expression (regex) search pattern.
+ none
diff --git a/bundles/org.openhab.transform.rollershutterposition/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.transform.rollershutterposition/src/main/resources/OH-INF/addon/addon.xml
index 9178c4e24e0fd..0555a28207a24 100644
--- a/bundles/org.openhab.transform.rollershutterposition/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.transform.rollershutterposition/src/main/resources/OH-INF/addon/addon.xml
@@ -7,5 +7,6 @@
Roller Shutter Position Emulation
Emulates absolute position setting for roller shutter devices which only support basic UP/DOWN/STOP
commands.
+ none
diff --git a/bundles/org.openhab.transform.scale/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.transform.scale/src/main/resources/OH-INF/addon/addon.xml
index 8189d7e52639c..2575baa2f99ee 100644
--- a/bundles/org.openhab.transform.scale/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.transform.scale/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
transformation
Scale transformation
Transforms a numerical input to a string.
+ none
diff --git a/bundles/org.openhab.transform.xpath/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.transform.xpath/src/main/resources/OH-INF/addon/addon.xml
index 1c919338f4997..dd3649550e61a 100644
--- a/bundles/org.openhab.transform.xpath/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.transform.xpath/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
transformation
XPATH transformation
Extracts values from an XML string with the XPATH syntax.
+ none
diff --git a/bundles/org.openhab.transform.xslt/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.transform.xslt/src/main/resources/OH-INF/addon/addon.xml
index 9d9cfce9bbf19..be1977e3e4ff8 100644
--- a/bundles/org.openhab.transform.xslt/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.transform.xslt/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
transformation
XSLT transformation
Transform input using the XML Stylesheet Language for Transformations (XSLT).
+ none
diff --git a/bundles/org.openhab.voice.actiontemplatehli/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.voice.actiontemplatehli/src/main/resources/OH-INF/addon/addon.xml
index 829eb6df78f3a..187f5769be4b1 100644
--- a/bundles/org.openhab.voice.actiontemplatehli/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.voice.actiontemplatehli/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,7 @@
voice
Action Template Interpreter
A human language interpreter implementation powered by OpenNLP.
+ none
org.openhab.voice.actiontemplatehli
diff --git a/bundles/org.openhab.voice.mactts/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.voice.mactts/src/main/resources/OH-INF/addon/addon.xml
index 5535cdd15d473..8edc70775626d 100644
--- a/bundles/org.openhab.voice.mactts/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.voice.mactts/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,6 @@
voice
macOS Text-to-Speech
The macOS Text-to-Speech (TTS) service uses the macOS "say" command for producing spoken text.
- local
+ none
diff --git a/bundles/org.openhab.voice.marytts/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.voice.marytts/src/main/resources/OH-INF/addon/addon.xml
index a77d6126b6756..0eebb79359660 100644
--- a/bundles/org.openhab.voice.marytts/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.voice.marytts/src/main/resources/OH-INF/addon/addon.xml
@@ -7,6 +7,6 @@
Mary Text-to-Speech
The Mary Text-to-Speech (TTS) service is a pure Java implementation of a TTS service, which uses the
MaryTTS project of DFKI.
- local
+ none
diff --git a/bundles/org.openhab.voice.picotts/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.voice.picotts/src/main/resources/OH-INF/addon/addon.xml
index fe6a05f50c11e..1964698e68a6b 100644
--- a/bundles/org.openhab.voice.picotts/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.voice.picotts/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,6 @@
voice
Pico Text-to-Speech
The Pico Text-to-Speech (TTS) service uses the TTS binary from SVOX for producing spoken text.
- local
+ none
diff --git a/bundles/org.openhab.voice.porcupineks/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.voice.porcupineks/src/main/resources/OH-INF/addon/addon.xml
index e68c472ac39e4..8106ed9e0ecb0 100644
--- a/bundles/org.openhab.voice.porcupineks/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.voice.porcupineks/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,7 @@
voice
Porcupine Keyword Spotter
This voice service allows you to use the PicoVoice product Porcupine as your keyword spotter in openHAB.
+ hybrid
org.openhab.voice.procupineks
diff --git a/bundles/org.openhab.voice.rustpotterks/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.voice.rustpotterks/src/main/resources/OH-INF/addon/addon.xml
index 9ba652fa6d46b..b22ca23bd5e06 100644
--- a/bundles/org.openhab.voice.rustpotterks/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.voice.rustpotterks/src/main/resources/OH-INF/addon/addon.xml
@@ -7,6 +7,7 @@
Rustpotter Keyword Spotter
This voice service allows you to use the open source library Rustpotter as your keyword spotter in
openHAB.
+ none
org.openhab.voice.rustpotterks
diff --git a/bundles/org.openhab.voice.voskstt/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.voice.voskstt/src/main/resources/OH-INF/addon/addon.xml
index 6c3e7dd1bfed4..f869c7d617c5b 100644
--- a/bundles/org.openhab.voice.voskstt/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.voice.voskstt/src/main/resources/OH-INF/addon/addon.xml
@@ -5,7 +5,8 @@
voice
Vosk Speech-to-Text
- osk STT Service uses vosk-api to perform offline speech-to-text in openHAB.
+ Vosk STT Service uses vosk-api to perform offline speech-to-text in openHAB.
+ none
org.openhab.voice.voskstt