diff --git a/roles/pve-subscribe/files/pve-enterprise.list b/roles/pve-subscribe/files/pve-enterprise.list
deleted file mode 100644
index 27c0fbc..0000000
--- a/roles/pve-subscribe/files/pve-enterprise.list
+++ /dev/null
@@ -1 +0,0 @@
-deb https://enterprise.proxmox.com/debian/pve stretch pve-enterprise
diff --git a/roles/pve-subscribe/files/pve-no-subscription.list b/roles/pve-subscribe/files/pve-no-subscription.list
deleted file mode 100644
index 5c1ddaa..0000000
--- a/roles/pve-subscribe/files/pve-no-subscription.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://download.proxmox.com/debian stretch pve-no-subscription
diff --git a/roles/pve-subscribe/tasks/enterprise.yml b/roles/pve-subscribe/tasks/enterprise.yml
index 0c593f1..306bf41 100644
--- a/roles/pve-subscribe/tasks/enterprise.yml
+++ b/roles/pve-subscribe/tasks/enterprise.yml
@@ -4,7 +4,7 @@
   file: path=/etc/apt/sources.list.d/pve-no-subscription.list state=absent
 
 - name: Configuring enterprise repo
-  copy: src=pve-enterprise.list dest=/etc/apt/sources.list.d/pve-enterprise.list
+  template: src=pve-enterprise.list.j2 dest=/etc/apt/sources.list.d/pve-enterprise.list
 
 - name: Removing previously installed pve-subscribe hook for cron
   cron: name=pve-subscribe special_time=reboot job=/etc/cron.d/pve-subscribe state=absent
diff --git a/roles/pve-subscribe/tasks/no-subscription.yml b/roles/pve-subscribe/tasks/no-subscription.yml
index 98f7613..15050f4 100644
--- a/roles/pve-subscribe/tasks/no-subscription.yml
+++ b/roles/pve-subscribe/tasks/no-subscription.yml
@@ -4,7 +4,7 @@
   file: path=/etc/apt/sources.list.d/pve-enterprise.list state=absent
 
 - name: Configuring no-subscription repo
-  copy: src=pve-no-subscription.list dest=/etc/apt/sources.list.d/pve-no-subscription.list
+  template: src=pve-no-subscription.list.j2 dest=/etc/apt/sources.list.d/pve-no-subscription.list
 
 - name: Installing pve-subscribe script
   copy: src=pve-subscribe dest=/usr/local/bin/pve-subscribe mode=0755 owner=root
diff --git a/roles/pve-subscribe/templates/pve-enterprise.list.j2 b/roles/pve-subscribe/templates/pve-enterprise.list.j2
new file mode 100644
index 0000000..360c42c
--- /dev/null
+++ b/roles/pve-subscribe/templates/pve-enterprise.list.j2
@@ -0,0 +1 @@
+deb https://enterprise.proxmox.com/debian/pve {{ ansible_distribution_release }} pve-enterprise
diff --git a/roles/pve-subscribe/templates/pve-no-subscription.list.j2 b/roles/pve-subscribe/templates/pve-no-subscription.list.j2
new file mode 100644
index 0000000..09e5dbc
--- /dev/null
+++ b/roles/pve-subscribe/templates/pve-no-subscription.list.j2
@@ -0,0 +1 @@
+deb http://download.proxmox.com/debian {{ ansible_distribution_release }} pve-no-subscription