diff --git a/data/conf/cgrates/cgrates.json b/data/conf/cgrates/cgrates.json
index 318b1f95c..12d24cc37 100755
--- a/data/conf/cgrates/cgrates.json
+++ b/data/conf/cgrates/cgrates.json
@@ -975,13 +975,13 @@
 //     "rpc":{
 //         "enabled": false,
 //         "registrars_conns": [],
-//         "hosts": {},  
+//         "hosts": [],
 //         "refresh_interval": "5m",
 //     },
 //     "dispatchers":{
 //         "enabled": false,
 //         "registrars_conns": [],
-//         "hosts": {},  
+//         "hosts": [],
 //         "refresh_interval": "5m",
 //     },
 // },
diff --git a/data/conf/samples/registrarc/all2_mongo/cgrates.json b/data/conf/samples/registrarc/all2_mongo/cgrates.json
index 9b9056523..6622249ad 100644
--- a/data/conf/samples/registrarc/all2_mongo/cgrates.json
+++ b/data/conf/samples/registrarc/all2_mongo/cgrates.json
@@ -108,9 +108,14 @@
 	"dispatchers":{
 		"enabled": true,
 		"registrars_conns": ["dispConn"],
-		"hosts": {
-			"*default":[{"ID":"ALL2", "transport": "*json", "tls": false}]
-		},  
+		"hosts": [
+			{
+				"Tenant": "*default",
+				"ID":"ALL2",
+				"transport": "*json",
+				"tls": false
+			},
+		],
 		"refresh_interval": "1s",
 	},
 }
diff --git a/data/conf/samples/registrarc/all2_mysql/cgrates.json b/data/conf/samples/registrarc/all2_mysql/cgrates.json
index 90772b178..d7fb0ca77 100644
--- a/data/conf/samples/registrarc/all2_mysql/cgrates.json
+++ b/data/conf/samples/registrarc/all2_mysql/cgrates.json
@@ -106,9 +106,14 @@
         "dispatchers":{
             "enabled": true,
             "registrars_conns": ["dispConn"],
-            "hosts": {
-                "*default":[{"ID":"ALL2", "transport": "*json", "tls": false}]
-            },  
+            "hosts": [
+                {
+                    "Tenant": "*default",
+                    "ID":"ALL2",
+                    "transport": "*json",
+                    "tls": false
+                },
+            ],
             "refresh_interval": "1s",
         },
     }
diff --git a/data/conf/samples/registrarc/all_mongo/cgrates.json b/data/conf/samples/registrarc/all_mongo/cgrates.json
index 5166dabf3..bd7d6ad14 100644
--- a/data/conf/samples/registrarc/all_mongo/cgrates.json
+++ b/data/conf/samples/registrarc/all_mongo/cgrates.json
@@ -112,9 +112,14 @@
 	"dispatchers":{
 		"enabled": true,
 		"registrars_conns": ["dispConn"],
-		"hosts": {
-			"*default":[{"ID":"ALL2", "transport": "*json", "tls": false}]
-		},  
+		"hosts": [
+			{
+				"Tenant": "*default",
+				"ID":"ALL2",
+				"transport": "*json",
+				"tls": false
+			},
+		],
 		"refresh_interval": "1s",
 	},
 }
diff --git a/data/conf/samples/registrarc/all_mysql/cgrates.json b/data/conf/samples/registrarc/all_mysql/cgrates.json
index 81bc8d99b..8c9ec1a71 100644
--- a/data/conf/samples/registrarc/all_mysql/cgrates.json
+++ b/data/conf/samples/registrarc/all_mysql/cgrates.json
@@ -110,9 +110,14 @@
 	"dispatchers":{
 		"enabled": true,
 		"registrars_conns": ["dispConn"],
-		"hosts": {
-			"*default":[{"ID":"ALL2", "transport": "*json", "tls": false}]
-		},  
+		"hosts": [
+			{
+				"Tenant": "*default",
+				"ID":"ALL2",
+				"transport": "*json",
+				"tls": false
+			},
+		],
 		"refresh_interval": "1s",
 	},
 }
diff --git a/data/conf/samples/registrarc/registrarc_rpc_mongo/cgrates.json b/data/conf/samples/registrarc/registrarc_rpc_mongo/cgrates.json
index ef640fa3a..be9d86590 100644
--- a/data/conf/samples/registrarc/registrarc_rpc_mongo/cgrates.json
+++ b/data/conf/samples/registrarc/registrarc_rpc_mongo/cgrates.json
@@ -146,9 +146,14 @@
     "rpc":{
         "enabled": true,
         "registrars_conns": ["regConn"],
-        "hosts": {
-			"*default":[{"ID":"attributes", "transport": "*json"}]
-		},  
+        "hosts": [
+			{
+				"Tenant": "*default",
+				"ID":"attributes",
+				"transport": "*json",
+				"tls": false
+			},
+		],
         "refresh_interval": "1s",
     },
 },
diff --git a/data/conf/samples/registrarc/registrarc_rpc_mysql/cgrates.json b/data/conf/samples/registrarc/registrarc_rpc_mysql/cgrates.json
index 67c900758..6dbb05218 100644
--- a/data/conf/samples/registrarc/registrarc_rpc_mysql/cgrates.json
+++ b/data/conf/samples/registrarc/registrarc_rpc_mysql/cgrates.json
@@ -143,9 +143,14 @@
     "rpc":{
         "enabled": true,
         "registrars_conns": ["regConn"],
-        "hosts": {
-			"*default":[{"ID":"attributes", "transport": "*json"}]
-		},  
+        "hosts": [
+			{
+				"Tenant": "*default",
+				"ID":"attributes",
+				"transport": "*json",
+				"tls": false
+			},
+		],
         "refresh_interval": "1s",
     },
 },