diff --git a/pillar/static/example.sls b/pillar/static/example.sls
index 6cfc6bee6..2f1fdb178 100644
--- a/pillar/static/example.sls
+++ b/pillar/static/example.sls
@@ -3,4 +3,4 @@ static:
   ntpserver:
   homenet:
   proxy:
-  masterupdate: 
+  masterupdate:
diff --git a/pillar/top.sls b/pillar/top.sls
index 555e2be48..53c3ba411 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -2,7 +2,9 @@ base:
   'G@role:so-sensor':
     - sensors.schedule
     - sensors.{{ grains.host }}
+    - static
 
   'G@role:so-master':
     - masters.schedule
     - masters.{{ grains.host }}
+    - static
diff --git a/salt/master/init.sls b/salt/master/init.sls
index 6b30fcbf1..be522c30e 100644
--- a/salt/master/init.sls
+++ b/salt/master/init.sls
@@ -12,3 +12,17 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+{% set masterproxy = salt['pillar.get']('static:masterupdate', '0') %}
+
+{% if masterproxy == 1 %}
+
+# Create the config directory for apt-cacher-ng
+# Copy the config
+# Install the apt-cacher-ng container
+
+# Create the config directory for the docker registry
+# Copy the config
+# Install the registry container
+
+{% endif %}