diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index a8ba6db..d124aa4 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -39,24 +39,24 @@ gre_matrix:
  - { id: 26, a: gw21, b: gw31 }
 # - { id: 33, a: gw22, b: gw31 }
 
-netbox_domain: netbox.ffrgb
+netbox_domain: netbox.regensburg.freifunk.net
 netbox_dbname: netbox
 netbox_dbuser: netbox
 netbox_dbpass: "{{ vault_netbox_dbpass }}"
 netbox_secret: "{{ vault_netbox_secret }}"
 
 node_targets:
+- ns1.regensburg.freifunk.net:9100
+- stats.regensburg.freifunk.net:9100
 - gw11.regensburg.freifunk.net:9100
 - gw21.regensburg.freifunk.net:9100
 - gw31.regensburg.freifunk.net:9100
-- ns1.regensburg.freifunk.net:9100
-- resolver.regensburg.freifunk.net:9100
-- stats.regensburg.freifunk.net:9100
 - web.regensburg.freifunk.net:9100
+- resolver.regensburg.freifunk.net:9100
+- netbox.regensburg.freifunk.net:9100
 - unms.ffrgb:9100
 - unifi.ffrgb:9100
 - tiles.ffrgb:9100
-- netbox.ffrgb:9100
 
 ntp_servers:
 - 0.de.pool.ntp.org
diff --git a/hosts b/hosts
index 8575cc0..0888d30 100644
--- a/hosts
+++ b/hosts
@@ -2,6 +2,7 @@
 gw11.regensburg.freifunk.net
 gw21.regensburg.freifunk.net
 gw31.regensburg.freifunk.net
+netbox.regensburg.freifunk.net
 ns1.regensburg.freifunk.net
 resolver.regensburg.freifunk.net
 stats.regensburg.freifunk.net
@@ -9,4 +10,3 @@ web.regensburg.freifunk.net
 unms.ffrgb ansible_host=10.90.224.101
 unifi.ffrgb ansible_host=10.90.224.102
 tiles.ffrgb ansible_host=10.90.224.103
-netbox.ffrgb ansible_host=10.90.224.104
diff --git a/site.yml b/site.yml
index 899ec69..031bf8a 100644
--- a/site.yml
+++ b/site.yml
@@ -55,6 +55,11 @@
   roles:
   - dns_resolver
 
+- name: Setup netbox server
+  hosts: netbox.regensburg.freifunk.net
+  roles:
+  - netbox
+
 - name: Setup unms server
   hosts: unms.ffrgb
   roles:
@@ -69,8 +74,3 @@
   hosts: tiles.ffrgb
   roles:
   - tileserver
-
-- name: Setup netbox server
-  hosts: netbox.ffrgb
-  roles:
-  - netbox