diff --git a/tasks/editor.yml b/tasks/editor.yml
index f62c3e6..d0e6eb7 100644
--- a/tasks/editor.yml
+++ b/tasks/editor.yml
@@ -5,7 +5,7 @@
     name: editor
     path: /usr/bin/vim.basic
   when:
-    - editor_is_vim | bool
+    - base__install_vim | bool
     - ansible_distribution != 'CentOS'
     - ansible_distribution != 'RedHat'
     - ansible_distribution != 'Archlinux'
@@ -17,7 +17,7 @@
     name: editor
     path: /usr/bin/vim
   when:
-    - editor_is_vim | bool
+    - base__install_vim | bool
     - ansible_distribution == 'CentOS'
     - ansible_distribution == 'RedHat'
     - ansible_distribution == 'Archlinux'
diff --git a/tasks/sources.yml b/tasks/sources.yml
index 2845825..65a05f5 100644
--- a/tasks/sources.yml
+++ b/tasks/sources.yml
@@ -25,7 +25,7 @@
     group: root
     owner: root
   notify: apt update
-  when: ansible_distribution_major_version < '11'
+  when: ansible_distribution_major_version > '10'
 
 - name: add eth zurich apt for Debian < 11
   become: true
diff --git a/templates/apt.sources.list.j2 b/templates/apt.sources.list.j2
index cf336b1..68f2ba9 100644
--- a/templates/apt.sources.list.j2
+++ b/templates/apt.sources.list.j2
@@ -41,7 +41,7 @@ deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}-secu
 {%- endif -%}
 
 {%- if base__pkg_updates -%}
-deb http://deb.debian.org/debian stable-updates main
+deb https://debian.ethz.ch/debian stable-updates main
   {%- if base__pkg_contrib | bool -%}
     {{- ' contrib' -}}
   {%- endif -%}
@@ -49,7 +49,7 @@ deb http://deb.debian.org/debian stable-updates main
     {{- ' non-free' -}}
   {%- endif -%}
   {{- '\n' -}}
-deb-src http://deb.debian.org/debian {{ ansible_distribution_release }}-updates main
+deb-src 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 039af60..a26f436 100644
--- a/templates/apt.sources.list_legacy.j2
+++ b/templates/apt.sources.list_legacy.j2
@@ -29,7 +29,7 @@ deb https://security.debian.ethz.ch/ {{ ansible_distribution_release }}/updates
     {{- ' non-free' -}}
   {%- endif -%}
   {{- '\n' -}}
-deb http://security.debian.org/ {{ ansible_distribution_release }}/updates main
+deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}/updates main
   {%- if base__pkg_contrib | bool -%}
     {{- ' contrib' -}}
   {%- endif -%}