diff --git a/templates/apt.sources.list.j2 b/templates/apt.sources.list.j2
index 68f2ba9..a2a6a3d 100644
--- a/templates/apt.sources.list.j2
+++ b/templates/apt.sources.list.j2
@@ -21,7 +21,7 @@ deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }} main
   {{- '\n\n' -}}
 
 {%- if base__pkg_security | bool -%}
-# Inofficial Security Mirror
+# Inofficial Debian Security Mirror
 deb https://security.debian.ethz.ch/ {{ ansible_distribution_release }}-security main
   {%- if base__pkg_contrib | bool -%}
     {{- ' contrib' -}}
@@ -41,7 +41,8 @@ deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}-secu
 {%- endif -%}
 
 {%- if base__pkg_updates -%}
-deb https://debian.ethz.ch/debian stable-updates main
+# {{ ansible_distribution_release }}-updates, previously known as 'volatile'
+deb https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates main
   {%- if base__pkg_contrib | bool -%}
     {{- ' contrib' -}}
   {%- endif -%}
diff --git a/templates/apt.sources.list_legacy.j2 b/templates/apt.sources.list_legacy.j2
index a26f436..4d394a7 100644
--- a/templates/apt.sources.list_legacy.j2
+++ b/templates/apt.sources.list_legacy.j2
@@ -39,6 +39,26 @@ deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}/upda
   {{- '\n\n' -}}
 {%- endif -%}
 
+{%- if base__pkg_updates -%}
+# {{ ansible_distribution_release }}-updates, previously known as 'volatile'
+deb https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates main
+  {%- if base__pkg_contrib | bool -%}
+    {{- ' contrib' -}}
+  {%- endif -%}
+  {%- if base__pkg_non_free_firmware | bool -%}
+    {{- ' non-free' -}}
+  {%- endif -%}
+  {{- '\n' -}}
+deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates main
+  {%- if base__pkg_contrib | bool -%}
+    {{- ' contrib' -}}
+  {%- endif -%}
+  {%- if base__pkg_non_free_firmware | bool -%}
+    {{- ' non-free' -}}
+  {%- endif -%}
+  {{- '\n\n' -}}
+{%- endif -%}
+
 # Contact for proplems with the mirror:
 # https://readme.phys.ethz.ch/services/contact/
 # Or #isgphys on irc.phys.ethz.ch
diff --git a/vars/main.yml b/vars/main.yml
index 29bf3a3..2332119 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -61,5 +61,5 @@ base__linux_packages:
   - bzip2
   - jq
 
-playbook_version_number: 9015
+playbook_version_number: 9016
 playbook_version_path: 'base-packages_roles-ansible_github.version'