diff --git a/FORMULAS.yaml b/FORMULAS.yaml
deleted file mode 100644
index 49775f1..0000000
--- a/FORMULAS.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-chrony: {}
-elasticsearch: {}
-git: {}
-grains:
-  namespace: 'tampakrap'
-keepalived: {}
-limits:
-  namespace: 'ryancurrah'
-locale: {}
-mysql: {}
-nginx: {}
-ntp: {}
-openldap: {}
-openssh: {}
-powerdns: {}
-rsyslog:
-  namespace: 'tampakrap'
-  pending:
-    - 'https://github.com/saltstack-formulas/rsyslog-formula/pull/16'
-salt: {}
-sqlite:
-  namespace: 'tampakrap'
-sssd:
-  original_namespace: 'Spark-Networks'
-  namespace: 'tampakrap'
-  pending:
-    - 'https://github.com/Spark-Networks/salt-sssd-formula/pull/1'
-  prefix: 'salt-'
-sudoers: {}
-timezone: {}
-zypper:
-  namespace: 'tampakrap'
diff --git a/FORMULAS.yaml b/FORMULAS.yaml
new file mode 120000
index 0000000..9291b26
--- /dev/null
+++ b/FORMULAS.yaml
@@ -0,0 +1 @@
+pillar/FORMULAS.yaml
\ No newline at end of file
diff --git a/pillar/FORMULAS.yaml b/pillar/FORMULAS.yaml
new file mode 100644
index 0000000..49775f1
--- /dev/null
+++ b/pillar/FORMULAS.yaml
@@ -0,0 +1,33 @@
+---
+chrony: {}
+elasticsearch: {}
+git: {}
+grains:
+  namespace: 'tampakrap'
+keepalived: {}
+limits:
+  namespace: 'ryancurrah'
+locale: {}
+mysql: {}
+nginx: {}
+ntp: {}
+openldap: {}
+openssh: {}
+powerdns: {}
+rsyslog:
+  namespace: 'tampakrap'
+  pending:
+    - 'https://github.com/saltstack-formulas/rsyslog-formula/pull/16'
+salt: {}
+sqlite:
+  namespace: 'tampakrap'
+sssd:
+  original_namespace: 'Spark-Networks'
+  namespace: 'tampakrap'
+  pending:
+    - 'https://github.com/Spark-Networks/salt-sssd-formula/pull/1'
+  prefix: 'salt-'
+sudoers: {}
+timezone: {}
+zypper:
+  namespace: 'tampakrap'
diff --git a/pillar/role/saltmaster.sls b/pillar/role/saltmaster.sls
index 8341883..bc53b68 100644
--- a/pillar/role/saltmaster.sls
+++ b/pillar/role/saltmaster.sls
@@ -27,26 +27,11 @@ salt:
           - root: salt
           - privkey: /var/lib/salt/.ssh/salt_gitlab_ioo_infra_salt
           - pubkey: /var/lib/salt/.ssh/salt_gitlab_ioo_infra_salt.pub
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/chrony-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/elasticsearch-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/git-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/grains-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/keepalived-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/limits-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/locale-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/mysql-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/nginx-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/ntp-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/openldap-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/openssh-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/powerdns-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/rsyslog-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/salt-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/sqlite-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/sssd-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/sudoers-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/timezone-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/zypper-formula.git
+      {% import_yaml "FORMULAS.yaml" as formulas_yaml %}
+      {% set formulas = formulas_yaml.keys()|sort %}
+      {% for formula in formulas %}
+      - https://gitlab.infra.opensuse.org/saltstack-formulas/{{ formula }}-formula.git
+      {% endfor %}
     gitfs_ssl_verify: True
     hash_type: sha512
     pillar_gitfs_ssl_verify: True