diff --git a/apt/templates/bookworm_basics.sources.j2 b/apt/templates/bookworm_basics.sources.j2
index 948c4adf..747e2e53 100644
--- a/apt/templates/bookworm_basics.sources.j2
+++ b/apt/templates/bookworm_basics.sources.j2
@@ -3,6 +3,6 @@
 Types: deb
 URIs: http://mirror.evolix.org/debian
 Suites: bookworm bookworm-updates
-Components: {{ apt_basics_components | mandatory }} 
+Components: {{ apt_basics_components | mandatory }}
 Enabled: yes
 Signed-By: /usr/share/keyrings/debian-archive-bookworm-automatic.gpg
diff --git a/apt/templates/bookworm_security.sources.j2 b/apt/templates/bookworm_security.sources.j2
index 07f1345b..b70fcec1 100644
--- a/apt/templates/bookworm_security.sources.j2
+++ b/apt/templates/bookworm_security.sources.j2
@@ -3,6 +3,6 @@
 Types: deb
 URIs: https://security.debian.org/debian-security
 Suites: bookworm-security
-Components: {{ apt_basics_components | mandatory }} 
+Components: {{ apt_basics_components | mandatory }}
 Enabled: yes
-Signed-By: /usr/share/keyrings/debian-archive-bookworm-security-automatic.gpg
\ No newline at end of file
+Signed-By: /usr/share/keyrings/debian-archive-bookworm-security-automatic.gpg
diff --git a/apt/templates/bullseye_basics.list.j2 b/apt/templates/bullseye_basics.list.j2
index 55f32b8d..d1820d0f 100644
--- a/apt/templates/bullseye_basics.list.j2
+++ b/apt/templates/bullseye_basics.list.j2
@@ -1,5 +1,5 @@
 # {{ ansible_managed }}
 
 deb http://mirror.evolix.org/debian bullseye {{ apt_basics_components | mandatory }}
-deb http://mirror.evolix.org/debian/ bullseye-updates {{ apt_basics_components | mandatory }} 
+deb http://mirror.evolix.org/debian bullseye-updates {{ apt_basics_components | mandatory }}
 deb http://security.debian.org/debian-security bullseye-security {{ apt_basics_components | mandatory }}
diff --git a/apt/templates/buster_basics.list.j2 b/apt/templates/buster_basics.list.j2
index 58209ba0..b392ce58 100644
--- a/apt/templates/buster_basics.list.j2
+++ b/apt/templates/buster_basics.list.j2
@@ -1,5 +1,5 @@
 # {{ ansible_managed }}
 
 deb http://mirror.evolix.org/debian buster {{ apt_basics_components | mandatory }}
-deb http://mirror.evolix.org/debian/ buster-updates {{ apt_basics_components | mandatory }}
+deb http://mirror.evolix.org/debian buster-updates {{ apt_basics_components | mandatory }}
 deb http://security.debian.org/debian-security buster/updates {{ apt_basics_components | mandatory }}
diff --git a/apt/templates/jessie_basics.list.j2 b/apt/templates/jessie_basics.list.j2
index 467e7f30..fad381f8 100644
--- a/apt/templates/jessie_basics.list.j2
+++ b/apt/templates/jessie_basics.list.j2
@@ -1,4 +1,4 @@
 # {{ ansible_managed }}
 
-deb http://mirror.evolix.org/debian/ jessie {{ apt_basics_components | mandatory }}
-deb http://security.debian.org/ jessie/updates {{ apt_basics_components | mandatory }}
+deb http://archive.org/debian jessie {{ apt_basics_components | mandatory }}
+deb http://archive.debian.org/debian-security jessie/updates {{ apt_basics_components | mandatory }}
diff --git a/apt/templates/stretch_basics.list.j2 b/apt/templates/stretch_basics.list.j2
index 2f0bf99e..f679e354 100644
--- a/apt/templates/stretch_basics.list.j2
+++ b/apt/templates/stretch_basics.list.j2
@@ -1,5 +1,4 @@
 # {{ ansible_managed }}
 
-deb http://mirror.evolix.org/debian stretch {{ apt_basics_components | mandatory }}
-deb http://mirror.evolix.org/debian/ stretch-updates {{ apt_basics_components | mandatory }}
-deb http://security.debian.org/debian-security stretch/updates {{ apt_basics_components | mandatory }}
+deb http://archive.debian.org/debian stretch {{ apt_basics_components | mandatory }}
+deb http://archive.debian.org/debian-security stretch/updates {{ apt_basics_components | mandatory }}