diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index 2660182..92faa23 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -6,6 +6,16 @@ ansible_become: yes
 ansible_pull_repo: "https://git.desu.ltd/salt/ansible"
 ansible_pull_commit: master
 common_ansible_pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDfXVgMHeD2wtCAIVoDYQ+R19vKfhmR2FgUTkHhAzE2156fB/+IMB+6Qc4X3aFRIcUp+Ls8Vm8JQ3d0jvbcGQkgbAjRExQa71XGBmhxJCxzlCLBoQzBmTSnryL09LExoMynzVgrso8TQP92vZBGJFI/lLGAaop2l9pu+3cgM3sRaK+A11lcRCrS25C3hqPQhKC44zjzOt7sIoaG6RqG3CQ8jhE35bthQdBySOZVDgDKfjDyPuDzVxiKjsuNm4Ojzm0QW5gq6GkLOg2B8OSQ1TGQgBHQu4b8zsKBOUOdbZb0JLM8NdpH1cMntC0QBofy3DzqR/CFaSaBzUx+dnkBH0/pjBOrhHzzqZGOJayfC1igYki67HqzFV5IjhAVa+c4S9L/zbFk0+YZYdgMoKNlMU2LgzrSEastuXHD7NUy3fMP4BZbqg37SjQzFRXoUp5+ctVs9tCoy/qvvjT3UVGcn312eJrRRfWrYagU2nWKGyqbTOpsuOJ5OLlhopy6eP9+yRM= ansible"
+# This is a token generated post-setup
+# It is to be used for querying netbox
+netbox_token: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          31656630386363323836663537383930346336393061363461653532323561386632343063353161
+          6630636535373331633762363738613232636366663430330a356333623466623230616433373036
+          35386162633961616438383332346165323930333662376665616531613837316333653361313332
+          3065343761343338340a336266316339616134336332376336326332663435323937343531636238
+          37323530333463383062396363616263386430356438306133393130626365333932323734383165
+          3064663435626339393836353837643730333266366436373033
 
 # Admin user configuration
 adminuser_name: salt
diff --git a/playbooks/tasks/web/nagios.yml b/playbooks/tasks/web/nagios.yml
index 77b8d1e..5e4ec89 100644
--- a/playbooks/tasks/web/nagios.yml
+++ b/playbooks/tasks/web/nagios.yml
@@ -5,16 +5,11 @@
 - name: assure ssmtp.conf file for nagios
   file: path=/data/nagios/ssmtp.conf state=file mode=0640
   tags: [ nagios ]
-- name: template out hosts for nagios
-  template:
-    src: |
-      {% for host in query('netbox.netbox.nb_lookup', 'devices', api_endpoint='https://netbox.desu.ltd', token=secret_netbox_api_token)%}
-      {{ host }}
-      {% endfor %}
-    dest: /data/nagios/etc/objects/ansible-hosts.cfg
-    owner: root
-    group: root
-    mode: 0644
+- name: template out config for nagios
+  template: src=nagios-hosts.cfg.j2 dest=/data/nagios/etc/objects/ansible.cfg owner=root group=root mode=0644
+  tags: [ nagios, template ]
+- name: assure config file is loaded
+  lineinfile: path=/data/nagios/etc/nagios.cfg line='cfg_file=/opt/nagios/etc/objects/ansible.cfg'
   tags: [ nagios, template ]
 - name: docker deploy nagios
   docker_container: