diff --git a/CODEOWNERS b/CODEOWNERS
index 6e06d97d5..b42817fa6 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -363,7 +363,7 @@
 /bundles/org.openhab.binding.vigicrues/ @clinique
 /bundles/org.openhab.binding.vitotronic/ @steand
 /bundles/org.openhab.binding.vizio/ @mlobstein
-/bundles/org.openhab.binding.volvooncall/ @clinique @Jamstah
+/bundles/org.openhab.binding.volvooncall/ @Jamstah
 /bundles/org.openhab.binding.warmup/ @jamesmelville
 /bundles/org.openhab.binding.weathercompany/ @mhilbush
 /bundles/org.openhab.binding.weatherunderground/ @lolodomo
diff --git a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/addon/addon.xml
index 8fa1a3f58..3d4071518 100644
--- a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/addon/addon.xml
@@ -8,5 +8,6 @@
 	<description>This binding uses the Ecowatt API to expose clear signals to adopt the right gestures and to ensure a good
 		supply of electricity for all in Frances.</description>
 	<connection>cloud</connection>
+	<countries>fr</countries>
 
 </addon:addon>
diff --git a/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/addon/addon.xml
index 1e0876c15..6ca68f0e6 100644
--- a/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
 	<type>binding</type>
 	<name>GCE Electronics Binding</name>
 	<description>Provides access to IPX800 PLC build by GCE.</description>
+	<connection>local</connection>
 
 </addon:addon>
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/addon/addon.xml
index 0986d4079..8be43eb53 100644
--- a/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/addon/addon.xml
@@ -7,5 +7,6 @@
 	<name>Linky Binding</name>
 	<description>Retrieves your energy consumption data from Enedis website</description>
 	<connection>cloud</connection>
+	<countries>fr</countries>
 
 </addon:addon>
diff --git a/bundles/org.openhab.binding.meteoalerte/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.meteoalerte/src/main/resources/OH-INF/addon/addon.xml
index 470a5b8c4..c1dea5ba4 100644
--- a/bundles/org.openhab.binding.meteoalerte/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.meteoalerte/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,7 @@
 	<type>binding</type>
 	<name>Meteo Alerte Binding</name>
 	<description>Retrieves Meteo Alert levels in France</description>
+	<connection>cloud</connection>
+	<countries>fr</countries>
 
 </addon:addon>
diff --git a/bundles/org.openhab.binding.mynice/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.mynice/src/main/resources/OH-INF/addon/addon.xml
index 537e9cefc..df78fdb9b 100644
--- a/bundles/org.openhab.binding.mynice/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.mynice/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
 	<type>binding</type>
 	<name>MyNice Binding</name>
 	<description>This binding lets you connect to your IT4Wifi Nice device.</description>
+	<connection>local</connection>
 
 </addon:addon>
diff --git a/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/addon/addon.xml
index d246e6484..3b0fa35ad 100644
--- a/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
 	<type>binding</type>
 	<name>OpenUV Binding</name>
 	<description>Global Real-Time UV Index Forecast API</description>
+	<connection>cloud</connection>
 
 </addon:addon>
diff --git a/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/addon/addon.xml
index d81b0ff26..264d5f0d6 100644
--- a/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
 	<type>binding</type>
 	<name>@text/bindingName</name>
 	<description>@text/bindingDescription</description>
+	<connection>local</connection>
 
 </addon:addon>
diff --git a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/addon/addon.xml
index 04ce6b677..90443b7c8 100644
--- a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,7 @@
 	<type>binding</type>
 	<name>SNCF Binding</name>
 	<description>Retrieves French railway informations</description>
+	<connection>cloud</connection>
+	<countries>fr</countries>
 
 </addon:addon>
diff --git a/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/addon/addon.xml
index 6c209b20b..1a7b3f222 100644
--- a/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
 	<type>binding</type>
 	<name>Synop Analyzer Binding</name>
 	<description>This is the binding to download and interpret Synop messages</description>
+	<connection>cloud</connection>
 
 </addon:addon>
diff --git a/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/addon/addon.xml
index 841250914..691f1a98f 100644
--- a/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,7 @@
 	<type>binding</type>
 	<name>VigiCrues Binding</name>
 	<description>Retrieves rivers levels and alerts in France</description>
+	<connection>cloud</connection>
+	<countries>fr</countries>
 
 </addon:addon>
diff --git a/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/addon/addon.xml
index 432bfc365..3525b8413 100644
--- a/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
 	<type>binding</type>
 	<name>XmlTV Binding</name>
 	<description>This is the binding for reading and parsing XmlTV files</description>
+	<connection>local</connection>
 
 </addon:addon>