diff --git a/elasticsearch/server/single.yml b/elasticsearch/server/single.yml
index ab9e009..6606617 100644
--- a/elasticsearch/server/single.yml
+++ b/elasticsearch/server/single.yml
@@ -7,11 +7,6 @@
       sysctl:
         vm.max_map_count: 262144
         vm.swappiness: 0
-      repo:
-        tcpcloud_elasticsearch:
-          source: "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial elastic"
-          architectures: amd64
-          key_url: "http://apt.tcpcloud.eu/public.gpg"
   java:
     environment:
       headless: true
diff --git a/influxdb/server/single.yml b/influxdb/server/single.yml
index ce76490..3d40099 100644
--- a/influxdb/server/single.yml
+++ b/influxdb/server/single.yml
@@ -2,13 +2,6 @@
 - service.influxdb.server.single
 - system.influxdb.server.tmpfs_wal
 parameters:
-  linux:
-    system:
-      repo:
-        influxdb:
-          enabled: true
-          source: 'deb https://repos.influxdata.com/ubuntu xenial stable'
-          key_url: 'https://repos.influxdata.com/influxdb.key'
   influxdb:
     server:
       enabled: true
diff --git a/linux/system/repo/influxdb.yml b/linux/system/repo/influxdb.yml
new file mode 100644
index 0000000..b934503
--- /dev/null
+++ b/linux/system/repo/influxdb.yml
@@ -0,0 +1,8 @@
+parameters:
+  linux:
+    system:
+      repo:
+        influxdb:
+          source: 'deb [arch=amd64] https://repos.influxdata.com/ubuntu ${_param:linux_system_codename} stable'
+          architectures: amd64
+          key_url: 'https://repos.influxdata.com/influxdb.key'
\ No newline at end of file