diff --git a/linux/system/repo-local/elasticsearch.yml b/linux/system/repo-local/elasticsearch.yml
index 118e4e5..aa0b71d 100644
--- a/linux/system/repo-local/elasticsearch.yml
+++ b/linux/system/repo-local/elasticsearch.yml
@@ -4,6 +4,6 @@
       repo:
         tcpcloud_elasticsearch:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp-elastic"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly tcp-elastic"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/grafana.yml b/linux/system/repo-local/grafana.yml
index 4a07383..f7b1edd 100644
--- a/linux/system/repo-local/grafana.yml
+++ b/linux/system/repo-local/grafana.yml
@@ -4,6 +4,6 @@
       repo:
         grafana:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly grafana"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly grafana"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/opencontrail.yml b/linux/system/repo-local/opencontrail.yml
index 90d47a0..31371c9 100644
--- a/linux/system/repo-local/opencontrail.yml
+++ b/linux/system/repo-local/opencontrail.yml
@@ -5,6 +5,6 @@
         tcpcloud_contrail:
           # oc30 is now by default
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp-oc30"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly tcp-oc30"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/salt.yml b/linux/system/repo-local/salt.yml
index 273d850..b2a485d 100644
--- a/linux/system/repo-local/salt.yml
+++ b/linux/system/repo-local/salt.yml
@@ -4,6 +4,6 @@
       repo:
         salt:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly salt"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly salt"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/salt_formulas.yml b/linux/system/repo-local/salt_formulas.yml
index 8f6706a..c52599a 100644
--- a/linux/system/repo-local/salt_formulas.yml
+++ b/linux/system/repo-local/salt_formulas.yml
@@ -4,5 +4,5 @@
       repo:
         salt_formulas:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp-salt"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly tcp-salt"
           architectures: amd64
diff --git a/linux/system/repo-local/sensu.yml b/linux/system/repo-local/sensu.yml
index 3e5b5a5..51cd976 100644
--- a/linux/system/repo-local/sensu.yml
+++ b/linux/system/repo-local/sensu.yml
@@ -4,6 +4,6 @@
       repo:
         sensu:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly sensu"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly sensu"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/tcpcloud.yml b/linux/system/repo-local/tcpcloud.yml
index 69ae25a..98d0416 100644
--- a/linux/system/repo-local/tcpcloud.yml
+++ b/linux/system/repo-local/tcpcloud.yml
@@ -5,6 +5,6 @@
         tcpcloud:
           default: true
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp tcp-liberty tcp-extra"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly tcp tcp-liberty tcp-extra"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/tcpcloud_main.yml b/linux/system/repo-local/tcpcloud_main.yml
index 4d326f9..26d2bc8 100644
--- a/linux/system/repo-local/tcpcloud_main.yml
+++ b/linux/system/repo-local/tcpcloud_main.yml
@@ -5,6 +5,6 @@
         tcpcloud_main:
           default: false
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly tcp"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/ubuntu-liberty.yml b/linux/system/repo-local/ubuntu-liberty.yml
index b06c31a..9f2c365 100644
--- a/linux/system/repo-local/ubuntu-liberty.yml
+++ b/linux/system/repo-local/ubuntu-liberty.yml
@@ -4,7 +4,7 @@
       repo:
         cloudarchive:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly liberty"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly liberty"
           architectures: amd64
           default: true
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/ubuntu.yml b/linux/system/repo-local/ubuntu.yml
index e683fa0..0bf352c 100644
--- a/linux/system/repo-local/ubuntu.yml
+++ b/linux/system/repo-local/ubuntu.yml
@@ -4,19 +4,19 @@
       repo:
         ubuntu:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename} nightly main"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_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"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_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"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}-security nightly main"
           architectures: amd64
           default: true
           key_url: "http://${_param:local_repo_url}/public.gpg"