diff --git a/tasks/debian11.yml b/tasks/debian11.yml
index 448003f..87a1af4 100644
--- a/tasks/debian11.yml
+++ b/tasks/debian11.yml
@@ -31,3 +31,23 @@
     group: "{{ pxeboot_groupname }}"
     mode: "0644"
   with_items: "{{ pxeboot_debian11_nonfree_files }}"
+
+- name: Create debian11 preseed files (serial)
+  template:
+    src: "debian11_preseed.cfg.j2"
+    dest: "{{ pxeboot_web_root }}/debian11/{{ item['serial'] }}_preseed.cfg"
+    owner: "{{ pxeboot_username }}"
+    group: "{{ pxeboot_groupname }}"
+    mode: "0644"
+  with_items: "{{ pxeboot_hosts }}"
+  when: "'serial' in item and item.serial"
+
+- name: Create preseed files (MAC)
+  template:
+    src: "debian11_preseed.cfg.j2"
+    dest: "{{ pxeboot_web_root }}/debian11/{{ item['mac_address'] | lower }}_preseed.cfg"
+    owner: "{{ pxeboot_username }}"
+    group: "{{ pxeboot_groupname }}"
+    mode: "0644"
+  with_items: "{{ pxeboot_hosts }}"
+  when: "'mac_address' in item and item.mac_address"
diff --git a/tasks/memtest.yml b/tasks/memtest.yml
index 06c5d80..f81a71b 100644
--- a/tasks/memtest.yml
+++ b/tasks/memtest.yml
@@ -14,8 +14,10 @@
 
 - name: Download memtest compressed ISO
   get_url:
-    url: >
-      http://memtest.org/download/{{ pxeboot_memtest_version }}/memtest86+-{{ pxeboot_memtest_version }}.iso.gz
+    url: >-
+      https://memtest.org/download/archives/{{
+      pxeboot_memtest_version }}/memtest86+-{{
+      pxeboot_memtest_version }}.iso.gz
     checksum: "{{ pxeboot_memtest_checksum }}"
     dest: "{{ pxeboot_dist_dir }}/memtest86+-{{ pxeboot_memtest_version }}.iso.gz"
     owner: "root"