diff --git a/bundles/org.openhab.binding.tacmi/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.tacmi/src/main/resources/OH-INF/addon/addon.xml
index ab968555856..2102920385f 100644
--- a/bundles/org.openhab.binding.tacmi/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.tacmi/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
TA C.M.I. Binding
This is the binding for TA C.M.I.
+ local
diff --git a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/addon/addon.xml
index 6bf2c7fb5ac..51dfce39d0d 100644
--- a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
Teleinfo Binding
The Teleinfo binding decodes the electrical statistics from an ENEDIS/ERDF Electricity Meter
+ local
diff --git a/bundles/org.openhab.binding.tellstick/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.tellstick/src/main/resources/OH-INF/addon/addon.xml
index e86ff6f80f9..51c95667e59 100644
--- a/bundles/org.openhab.binding.tellstick/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.tellstick/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
Tellstick Binding
This is the binding for Telldus Tellstick Basic, Duo, .Net and Z-Net Lite.
+ hybrid
diff --git a/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/addon/addon.xml
index 6787eef9587..b1c66d64587 100644
--- a/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
TouchWand Binding
Connect to TouchWand Wanderfull™ Hub and communicate with units connected to the controller.
+ local
diff --git a/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/addon/addon.xml
index ed979358487..c8cc8121099 100644
--- a/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
TpLinkRouter Binding
This is the binding for controlling a TP-Link router with telnet.
+ local
diff --git a/bundles/org.openhab.binding.tplinksmarthome/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.tplinksmarthome/src/main/resources/OH-INF/addon/addon.xml
index a896c48b35c..429c1af74fa 100644
--- a/bundles/org.openhab.binding.tplinksmarthome/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.tplinksmarthome/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
TP-Link Smart Home Binding
This binding integrates the TP-Link Wi-Fi Smart Home devices.
+ local
diff --git a/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/addon/addon.xml
index 1c597e49b83..d820e3290a8 100644
--- a/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
TR-064 Binding
This is the binding for TR-064 device support.
+ local
diff --git a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/addon/addon.xml
index d819efc9659..099c0b1d0f9 100644
--- a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
TRÅDFRI Binding
This binding supports IKEA TRÅDFRI lighting devices through the IKEA gateway.
+ local
diff --git a/bundles/org.openhab.binding.unifiedremote/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.unifiedremote/src/main/resources/OH-INF/addon/addon.xml
index 25881195f3a..90b4c6cf328 100644
--- a/bundles/org.openhab.binding.unifiedremote/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.unifiedremote/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
Unified Remote Binding
This is the binding for Unified Remote Server (https://www.unifiedremote.com/).
+ local
diff --git a/bundles/org.openhab.binding.upb/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.upb/src/main/resources/OH-INF/addon/addon.xml
index 29dad0d4854..4d50250642b 100644
--- a/bundles/org.openhab.binding.upb/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.upb/src/main/resources/OH-INF/addon/addon.xml
@@ -6,6 +6,7 @@
binding
UPB Binding
The Universal Powerline Bus (UPB) binding reads and writes messages to and from a UPB modem
+ local
org.openhab.upb
diff --git a/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/addon/addon.xml
index 295b3e5fb88..0f38281b601 100644
--- a/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
@text/bindingLabel
@text/bindingDescription
+ local
diff --git a/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/addon/addon.xml
index 752d7f83e90..e5a3aa12bcc 100644
--- a/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
ValloxMV Binding
Binding for online interface of Vallox ventilation unit
+ local
diff --git a/bundles/org.openhab.binding.vdr/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.vdr/src/main/resources/OH-INF/addon/addon.xml
index 3241625bfeb..45f0cb89342 100644
--- a/bundles/org.openhab.binding.vdr/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.vdr/src/main/resources/OH-INF/addon/addon.xml
@@ -7,5 +7,6 @@
VDR Binding
The Video Disk Recorder (VDR) binding allows to control your own Video Disk Recorder
(https://www.tvdr.de).
+ local
diff --git a/bundles/org.openhab.binding.vektiva/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.vektiva/src/main/resources/OH-INF/addon/addon.xml
index e2317504438..b5b9c66cfc4 100644
--- a/bundles/org.openhab.binding.vektiva/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.vektiva/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
Vektiva Binding
This is the binding for Vektiva products controlled by local API.
+ local
diff --git a/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/addon/addon.xml
index 571726cdefd..abb8e1b3fd1 100644
--- a/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
Velbus Binding
This is the binding for Velbus.
+ local
diff --git a/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/addon/addon.xml
index 4901a38cd3c..bbae37d157b 100644
--- a/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/addon/addon.xml
@@ -6,4 +6,5 @@
binding
Venstar Thermostats
This is a binding for Venstar Thermostats.
+ local
diff --git a/bundles/org.openhab.binding.ventaair/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.ventaair/src/main/resources/OH-INF/addon/addon.xml
index 81ff1ff99ea..8b4757c2328 100644
--- a/bundles/org.openhab.binding.ventaair/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.ventaair/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
VentaAir Binding
This is the binding for Venta Air - Air cleaning and humidifying devices
+ local
diff --git a/bundles/org.openhab.binding.verisure/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.verisure/src/main/resources/OH-INF/addon/addon.xml
index c90fc39e74f..de814ba2ae1 100644
--- a/bundles/org.openhab.binding.verisure/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.verisure/src/main/resources/OH-INF/addon/addon.xml
@@ -6,4 +6,5 @@
binding
Verisure Binding
This is the binding for Verisure Alarm System.
+ cloud
diff --git a/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/addon/addon.xml
index 2aba3966a28..e2a9ca307c9 100644
--- a/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/addon/addon.xml
@@ -7,5 +7,6 @@
VeSync Binding
This is the binding for the VeSync products. Currently, this supports the Levoit branded Air Purifiers and
Humidifiers using the v2 protocol.
+ cloud
diff --git a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/addon/addon.xml
index 1f956aab9c4..4de54e4332a 100644
--- a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
Vitotronic Binding
This is the binding for Vitotronic.
+ local
diff --git a/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/addon/addon.xml
index 4c2bc23cf75..416335d414e 100644
--- a/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
VolvoOnCall Binding
This binding enables the access to VolvoOnCall services.
+ cloud
diff --git a/bundles/org.openhab.binding.warmup/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.warmup/src/main/resources/OH-INF/addon/addon.xml
index 79bfa34369e..ec2052bb6a0 100644
--- a/bundles/org.openhab.binding.warmup/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.warmup/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
Warmup Binding
This is the binding for a Warmup 4iE Thermostat primarily used for controlling underfloor heating.
+ cloud
diff --git a/bundles/org.openhab.binding.webthing/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.webthing/src/main/resources/OH-INF/addon/addon.xml
index b5de6110793..f3874c673ff 100644
--- a/bundles/org.openhab.binding.webthing/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.webthing/src/main/resources/OH-INF/addon/addon.xml
@@ -6,4 +6,5 @@
binding
WebThing Binding
The WebThing binding supports an interface to remote devices implementing the Web Thing API.
+ local
diff --git a/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/addon/addon.xml
index 4adc74fe1c4..c2a0960c365 100644
--- a/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
WiFi LED Binding
Binding for WiFi LED devices. These are known as Magic Home RGBW LED, UFO LED, LED NET controller etc.
+ local
diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.wlanthermo/src/main/resources/OH-INF/addon/addon.xml
index ef40f3df092..bad147bedd9 100644
--- a/bundles/org.openhab.binding.wlanthermo/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.wlanthermo/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
WlanThermo Binding
This is the binding for WlanThermo, ref. https://wlanthermo.de/
+ local
diff --git a/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/addon/addon.xml
index 9a4635ef3ba..1f14a672d09 100644
--- a/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
WLED Binding
This is the binding for WLED
+ local
diff --git a/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/addon/addon.xml
index 54cf3c11b78..e309ee5bb69 100644
--- a/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
WolfSmartset Binding
This is the binding for WolfSmartset smart systems.
+ cloud
diff --git a/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/addon/addon.xml
index c5497e60f8b..6984ee7b429 100644
--- a/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/addon/addon.xml
@@ -9,4 +9,5 @@
This binding enables acting as a receiver of updates from devices that post measurements to
https://rtupdate.wunderground.com/weatherstation/updateweatherstation.php.
+ local
diff --git a/bundles/org.openhab.binding.xmppclient/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.xmppclient/src/main/resources/OH-INF/addon/addon.xml
index 05191150496..4429a0c1034 100644
--- a/bundles/org.openhab.binding.xmppclient/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.xmppclient/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
XMPPClient Binding
This is the binding for XMPP (Jabber) notifications.
+ local
diff --git a/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/addon/addon.xml
index 04180e06620..4389a263d69 100644
--- a/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
Yeelight Binding
This is the binding for Yeelight products.
+ local
diff --git a/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/addon/addon.xml
index 2e51e516213..3616b6b50d1 100644
--- a/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
binding
YIOremote Binding
This is the binding for YIOremote.
+ local
diff --git a/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/addon/addon.xml
index 52876ebbbf6..b691f26b266 100644
--- a/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/addon/addon.xml
@@ -13,5 +13,6 @@
Currently only a continuous polling is available!
]]>
+ local