diff --git a/linux/system/repo-local/horizon.yml b/linux/system/repo-local/horizon.yml
deleted file mode 100644
index 3f6f477..0000000
--- a/linux/system/repo-local/horizon.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
-  linux:
-    system:
-      repo:
-        tcpcloud_horizon:
-          refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ ${_param:linux_distrib_codename} ${_param:horizon_version}"
-          architectures: amd64
-          #key_url: "http://apt.tcpcloud.eu/public.gpg"
-          key_url: "salt://tcpcloud_public.gpg"
diff --git a/linux/system/repo-local/mos8.yml b/linux/system/repo-local/mos8.yml
new file mode 100644
index 0000000..3232d03
--- /dev/null
+++ b/linux/system/repo-local/mos8.yml
@@ -0,0 +1,53 @@
+parameters:
+  linux:
+    system:
+      repo:
+        mos8_openstack:
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0 main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0'
+            priority: 1100
+            package: '*'
+        mos8_openstack_hotfix:
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-hotfix main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0-hotfix'
+            priority: 1100
+            package: '*'
+        mos8_openstack_proposed:
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-proposed main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0-proposed'
+            priority: 1100
+            package: '*'
+        mos8_openstack_security:
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-security main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0-security'
+            priority: 1100
+            package: '*'
+        mos8_openstack_updates:
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-updates main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0-updates'
+            priority: 1100
+            package: '*'
+        mos8_murano:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0 murano"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0-proposed'
+            priority: 1100
+            package: '*'
\ No newline at end of file
diff --git a/linux/system/repo-local/salt_xenial.yml b/linux/system/repo-local/salt_xenial.yml
deleted file mode 100644
index 273d850..0000000
--- a/linux/system/repo-local/salt_xenial.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-parameters:
-  linux:
-    system:
-      repo:
-        salt:
-          refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly salt"
-          architectures: amd64
-          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/ubuntu/cloudarchive.yml b/linux/system/repo-local/ubuntu-liberty.yml
similarity index 100%
rename from linux/system/repo-local/ubuntu/cloudarchive.yml
rename to linux/system/repo-local/ubuntu-liberty.yml
diff --git a/linux/system/repo-local/ubuntu.yaml b/linux/system/repo-local/ubuntu.yaml
new file mode 100644
index 0000000..e683fa0
--- /dev/null
+++ b/linux/system/repo-local/ubuntu.yaml
@@ -0,0 +1,23 @@
+parameters:
+  linux:
+    system:
+      repo:
+        ubuntu:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename} nightly main"
+          architectures: amd64
+          default: true
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+        ubuntu-updates:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}-updates nightly main"
+          architectures: amd64
+          default: true
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+        ubuntu-security:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}-security nightly main"
+          architectures: amd64
+          default: true
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+
diff --git a/linux/system/repo-local/ubuntu/trusty.yml b/linux/system/repo-local/ubuntu/trusty.yml
deleted file mode 100644
index b88e402..0000000
--- a/linux/system/repo-local/ubuntu/trusty.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
-  linux:
-    system:
-      repo:
-        ubuntu:
-          refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/trusty/ nightly main"
-          architectures: amd64
-          default: true
-          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/ubuntu/xenial.yml b/linux/system/repo-local/ubuntu/xenial.yml
deleted file mode 100644
index b4a1888..0000000
--- a/linux/system/repo-local/ubuntu/xenial.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
-  linux:
-    system:
-      repo:
-        ubuntu:
-          refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/xenial/ nightly main"
-          architectures: amd64
-          default: true
-          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/single.yml b/linux/system/single.yml
index 2c34541..fcfa1b1 100644
--- a/linux/system/single.yml
+++ b/linux/system/single.yml
@@ -3,7 +3,6 @@
 - service.salt.minion.master
 - system.openssh.server.single
 - system.ntp.client.single
-- system.linux.system.repo.tcp_base
 parameters:
   linux:
     system: