diff --git a/database/influxdb/node.go b/database/influxdb/node.go
index eb13f4b..a463fb5 100644
--- a/database/influxdb/node.go
+++ b/database/influxdb/node.go
@@ -34,6 +34,7 @@ func (conn *Connection) InsertNode(node *runtime.Node) {
 
 	tags := models.Tags{}
 	tags.SetString("nodeid", stats.NodeID)
+	tags.SetString("is_gateway", strconv.FormatBool(node.IsGateway()))
 
 	fields := models.Fields{
 		"load":             stats.LoadAverage,
@@ -192,12 +193,6 @@ func (conn *Connection) InsertNode(node *runtime.Node) {
 			"leases.pruned":    dhcp.LeasesPruned,
 		}
 
-		// Tags
-		tags.SetString("nodeid", stats.NodeID)
-		if nodeinfo := node.Nodeinfo; nodeinfo != nil {
-			tags.SetString("hostname", nodeinfo.Hostname)
-		}
-
 		conn.addPoint(MeasurementDHCP, tags, fields, time)
 	}
 }