diff --git a/roles/geodns/templates/geodns-update.service.j2 b/roles/geodns/templates/geodns-update.service.j2
index b548274b40ce065c9bb0207ca78f45358f213757..276c923f18efd594734631bee241576c48a9d32a 100644
--- a/roles/geodns/templates/geodns-update.service.j2
+++ b/roles/geodns/templates/geodns-update.service.j2
@@ -5,7 +5,7 @@ Description=GeoDNS update
 Type=oneshot
 WorkingDirectory={{ mdxsaas_dir }}
 ExecStart=git pull
-ExecStart=ansible-playbook playbook.yml -i inventory/local --tags local,geodns --limit local
+ExecStart=ansible-playbook playbook.yml -i inventory/local --tags local,geodns --limit {{ inventory_hostname }}
 ExecStartPost=/bin/systemctl restart geodns
 
 [Install]
diff --git a/roles/local/tasks/main.yml b/roles/local/tasks/main.yml
index 7beb6ecbc7606b18f82b5621fe7be925278c0b53..09096d6a4591b6a5eaabb944b822ab39b8dc7e02 100644
--- a/roles/local/tasks/main.yml
+++ b/roles/local/tasks/main.yml
@@ -12,6 +12,11 @@
     version: "{{ mdxsaas_version }}"
   register: mdxsaas_git
 
+- name: Create local inventory
+  ansible.builtin.template:
+    src: "local.j2"
+    dest: "{{ mdxsaas_dir }}/inventory/local"
+
 - name: Write MDX-SAAS repo version
   shell:
     cmd: "git rev-parse HEAD > /tmp/mdx-saas-revision"
diff --git a/inventory/local b/roles/local/templates/local.j2
similarity index 69%
rename from inventory/local
rename to roles/local/templates/local.j2
index d33c048c4f9d912bb9edac3589a81fa7a4bd285a..d89d6a9c8fee3ea9038aacdae8c00d73e52f8fec 100644
--- a/inventory/local
+++ b/roles/local/templates/local.j2
@@ -1,19 +1,20 @@
 # Inventory Aliases
-local           ansible_connection=local
+{{ inventory_hostname }} ansible_connection=local
 
 # Hosts that receive the mdsigner role
 [mdsigner]
 
 # Hosts that receive the mdproxy role
 [mdproxy]
-local
+{{ inventory_hostname }}
 
 # Hosts that receive the GeoDNS role
 [geodns]
-local
+{{ inventory_hostname }}
 
 # All hosts for base role
 [all:children]
 mdsigner
 mdproxy
 geodns
+
diff --git a/roles/mdproxy/templates/mdproxy-update.service.j2 b/roles/mdproxy/templates/mdproxy-update.service.j2
index bcdce656326ee9cee7aaf0e57074a25e650ea7d8..772ddf6a5aa73385ca0e390a8c19c6cd236b61e5 100644
--- a/roles/mdproxy/templates/mdproxy-update.service.j2
+++ b/roles/mdproxy/templates/mdproxy-update.service.j2
@@ -5,7 +5,7 @@ Description=mdproxy update
 Type=oneshot
 WorkingDirectory={{ mdxsaas_dir }}
 ExecStart=git pull
-ExecStart=ansible-playbook playbook.yml -i inventory/local --tags local,mdproxy --limit local
+ExecStart=ansible-playbook playbook.yml -i inventory/local --tags local,mdproxy --limit {{ inventory_hostname }}
 ExecStartPost=/bin/systemctl restart mdproxy
 
 [Install]