diff --git a/pillar/role/salt/minion.sls b/pillar/role/salt/minion.sls
index 0e0fb8a..291ebda 100644
--- a/pillar/role/salt/minion.sls
+++ b/pillar/role/salt/minion.sls
@@ -2,4 +2,3 @@ salt:
   minion_remove_config: True
   minion:
     master_type: str
-    master: {{ myconfig['salt_master'] }}
diff --git a/salt/profile/salt/minion.sls b/salt/profile/salt/minion.sls
index 6978eaf..32fb272 100644
--- a/salt/profile/salt/minion.sls
+++ b/salt/profile/salt/minion.sls
@@ -1,3 +1,12 @@
 include:
   - salt.minion
   - .grains
+
+/etc/salt/minion.d/master.conf:
+  file.managed:
+    - contents:
+      - 'master: {{ salt['pillar.get']('netbox:config_context:salt_master') }}'
+    - require_in:
+      - service: salt-minion
+    - watch_in:
+      - service: salt-minion