diff --git a/evolinux-base/files/apt/evolix_public.list b/evolinux-base/files/apt/evolix_public.list
deleted file mode 100644
index be799691..00000000
--- a/evolinux-base/files/apt/evolix_public.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://pub.evolix.net/ kernel/
-deb http://pub.evolix.net/ jessie/
diff --git a/evolinux-base/tasks/apt.yml b/evolinux-base/tasks/apt.yml
index c44a61d5..7056ffad 100644
--- a/evolinux-base/tasks/apt.yml
+++ b/evolinux-base/tasks/apt.yml
@@ -46,14 +46,14 @@
     dest: /etc/apt/sources.list
     line: "{{ item }}"
   with_items:
-  - "deb http://security.debian.org/ jessie/updates {{ evolinux_apt_repositories_components | mandatory }}"
-  - "deb http://mirror.evolix.org/debian/ jessie {{ evolinux_apt_repositories_components | mandatory }}"
-  - "deb http://mirror.evolix.org/debian/ jessie-updates {{ evolinux_apt_repositories_components | mandatory }}"
+  - "deb http://security.debian.org/ {{ ansible_distribution_release }}/updates {{ evolinux_apt_repositories_components | mandatory }}"
+  - "deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }} {{ evolinux_apt_repositories_components | mandatory }}"
+  - "deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }}-updates {{ evolinux_apt_repositories_components | mandatory }}"
   when: evolinux_apt_basic_sources
 
 - name: Evolix public list is installed
-  copy:
-    src: apt/evolix_public.list
+  template:
+    src: apt/evolix_public.list.j2
     dest: /etc/apt/sources.list.d/evolix_public.list
     force: yes
     backup: yes
diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml
index b2f2b060..26165f37 100644
--- a/evolinux-base/tasks/hardware.yml
+++ b/evolinux-base/tasks/hardware.yml
@@ -19,7 +19,7 @@
 
 - name: Add non-free repo for Broadcom NetXtreme II
   apt_repository:
-    repo: 'deb http://mirror.evolix.org/debian/ jessie non-free'
+    repo: 'deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }} non-free'
     state: present
   when: broadcom|success
 
diff --git a/evolinux-base/templates/apt/evolix_public.list.j2 b/evolinux-base/templates/apt/evolix_public.list.j2
new file mode 100644
index 00000000..22f17ba9
--- /dev/null
+++ b/evolinux-base/templates/apt/evolix_public.list.j2
@@ -0,0 +1,2 @@
+deb http://pub.evolix.net/ kernel/
+deb http://pub.evolix.net/ {{ ansible_distribution_release }}/