diff --git a/salt/files/master.d/engine.conf b/salt/files/master.d/engine.conf
index 5e7089d..746cdbe 100644
--- a/salt/files/master.d/engine.conf
+++ b/salt/files/master.d/engine.conf
@@ -1,7 +1,8 @@
 #
 # This file is managed by Salt! Do not edit by hand!
 #
-{%- set engines = salt['pillar.get']('salt:master:engines') -%}
+{%- set engines = salt['pillar.get']('salt:engines') -%}
+{%- set engines = salt['pillar.get']('salt:master:engines', default=engines, merge=True) -%}
 {%- if engines %}
 engines:
   {{ engines | yaml(False) | indent(2) }}
diff --git a/salt/files/minion.d/engine.conf b/salt/files/minion.d/engine.conf
index 17773e5..658f0e0 100644
--- a/salt/files/minion.d/engine.conf
+++ b/salt/files/minion.d/engine.conf
@@ -1,7 +1,8 @@
 #
 # This file is managed by Salt! Do not edit by hand!
 #
-{%- set engines = salt['pillar.get']('salt:minion:engines') -%}
+{%- set engines = salt['pillar.get']('salt:engines') -%}
+{%- set engines = salt['pillar.get']('salt:minion:engines', default=engines, merge=True) -%}
 {%- if engines %}
 engines:
   {{ engines | yaml(False) | indent(2) }}