diff --git a/base/packages/init.sls b/base/packages/init.sls
index 03d5ea1..e00e864 100644
--- a/base/packages/init.sls
+++ b/base/packages/init.sls
@@ -4,5 +4,6 @@
 
 include:
   - .common
+  - .repo.debian
   - .repo.maketank
   - .prometheus
diff --git a/base/packages/openhab2.sls b/base/packages/openhab2.sls
index 650f0a9..6677e7f 100644
--- a/base/packages/openhab2.sls
+++ b/base/packages/openhab2.sls
@@ -1,6 +1,13 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
+{%-
+ set cache_url = salt['pillar.get'](
+      'services:apt-cache',
+      default=''
+      )
+%}
+
 include:
   - haproxy
   - systemd.units
@@ -20,7 +27,7 @@ openhab2-pkgs:
 
 repo_openhab2:
   pkgrepo.managed:
-    - name: deb https://dl.bintray.com/openhab/apt-repo2 stable main 
+    - name: deb https://{{ cache_url }}dl.bintray.com/openhab/apt-repo2 stable main 
     #- dist: {{ grains['oscodename'] }}
     - file: /etc/apt/sources.list.d/openhab2.list
     - key_url: 'https://bintray.com/user/downloadSubjectPublicKey?username=openhab'
diff --git a/base/packages/repo/debian.sls b/base/packages/repo/debian.sls
index 173fe77..629a434 100644
--- a/base/packages/repo/debian.sls
+++ b/base/packages/repo/debian.sls
@@ -2,20 +2,35 @@
 # vim: ft=yaml
 ---
 
+{%-
+ set cache_url = salt['pillar.get'](
+      'services:apt-cache',
+      default=''
+      )
+%}
+
 repo_debian:
   pkgrepo.managed:
-    - name: deb http://deb.debian.org/debian {{ grains['oscodename'] }} main contrib non-free
+    - name: deb http://{{ cache_url }}deb.debian.org/debian {{ grains['oscodename'] }} main contrib non-free
     - dist: {{ grains['oscodename'] }}
     - file: /etc/apt/sources.list.d/debian.list
     - clean_file: True
 
 repo_debian-backports:
   pkgrepo.managed:
-    - name: deb http://deb.debian.org/debian {{ grains['oscodename'] }}-backports main contrib non-free
+    - name: deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}-backports main contrib non-free
     - dist: {{ grains['oscodename'] }}
     - file: /etc/apt/sources.list.d/debian-backports.list
     - clean_file: True
 
+repo_debian-security:
+  pkgrepo.managed:
+    - name: deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}/updates main contrib non-free
+    - dist: {{ grains['oscodename'] }}
+    - file: /etc/apt/sources.list.d/debian-security.list
+    - clean_file: True
+
+
 
 
 
diff --git a/base/packages/repo/maketank.sls b/base/packages/repo/maketank.sls
index 3a4d8c5..3ec8843 100644
--- a/base/packages/repo/maketank.sls
+++ b/base/packages/repo/maketank.sls
@@ -2,9 +2,15 @@
 # vim: ft=yaml
 ---
 
+{%- set cache_url = salt['pillar.get'](
+      'services:apt-cache',
+      default=''
+      )
+%}
+
 repo_maketank:
   pkgrepo.managed:
-    - name: deb http://apt.maketank.net/debian {{ grains['oscodename'] }} main
+    - name: deb http://{{ cache_url }}apt.maketank.net/debian {{ grains['oscodename'] }} main
     - dist: {{ grains['oscodename'] }}
     - file: /etc/apt/sources.list.d/maketank.list
     - key_url: http://apt.maketank.net/debian/debian.gpg