diff --git a/influxspeedtest/InfluxdbSpeedtest.py b/influxspeedtest/InfluxdbSpeedtest.py
index 3daa02b296e5948f0cd3a1ce7d5bff7a56b9e976..bf79295c9a3c34381b7478a44279157eab07056f 100644
--- a/influxspeedtest/InfluxdbSpeedtest.py
+++ b/influxspeedtest/InfluxdbSpeedtest.py
@@ -99,7 +99,9 @@ class InfluxdbSpeedtest():
                     'ping': result_dict['server']['latency']
                 },
                 'tags': {
-                    'server': result_dict['server']['id']
+                    'server': result_dict['server']['id'],
+                    'server_name': result_dict['server']['name'],
+                    'server_country': result_dict['server']['country']
                 }
             }
         ]