diff --git a/group_vars/virtu.yml b/group_vars/virtu.yml
index f97bbfe8886e083fbe403f9ab9cd134a1f70dc3f..570a04cb99168e11e4fd0041f89ac2f9f6d0e128 100644
--- a/group_vars/virtu.yml
+++ b/group_vars/virtu.yml
@@ -3,3 +3,4 @@ glob_debian_images:
   cron_timer: '39 06 * * *'
   rsync_host: 'eclat.adm.crans.org'
   rsync_module: 'mirror'
+  include_extra_images: false
diff --git a/host_vars/odlyd.adm.crans.org.yml b/host_vars/odlyd.adm.crans.org.yml
new file mode 100644
index 0000000000000000000000000000000000000000..119fa7ab3b1ecd24d2b45c9d8f0cb435cd24e518
--- /dev/null
+++ b/host_vars/odlyd.adm.crans.org.yml
@@ -0,0 +1,3 @@
+---
+loc_debian_images:
+  include_extra_images: true
diff --git a/host_vars/stitch.adm.crans.org.yml b/host_vars/stitch.adm.crans.org.yml
new file mode 100644
index 0000000000000000000000000000000000000000..119fa7ab3b1ecd24d2b45c9d8f0cb435cd24e518
--- /dev/null
+++ b/host_vars/stitch.adm.crans.org.yml
@@ -0,0 +1,3 @@
+---
+loc_debian_images:
+  include_extra_images: true
diff --git a/roles/proxmox-debian-images/tasks/main.yml b/roles/proxmox-debian-images/tasks/main.yml
index 401c7b2226c79f563071754e00e4e24aa1fcab9d..52c74c15b1715b4890ac71084104baa0fd05d657 100644
--- a/roles/proxmox-debian-images/tasks/main.yml
+++ b/roles/proxmox-debian-images/tasks/main.yml
@@ -20,6 +20,18 @@
     mode: 0755
     state: directory
 
+- name: Create specific directory for extra images (Arch Linux, Ubuntu)
+  file:
+    path: "/var/lib/vz/template/iso/{{ item }}"
+    owner: root
+    group: root
+    mode: 0755
+    state: directory
+  loop:
+    - archlinux
+    - ubuntu
+  when: debian_images.include_extra_images
+
 - name: Initial synchronization to download Debian images
   shell: "rsync --verbose --dirs --compress --times --update --delete-after --delete-excluded --include 'debian-[0-9]*-amd64-netinst.iso' --exclude '*' rsync://{{ debian_images.rsync_host }}/{{ debian_images.rsync_module }}/cdimage-debian/release/current/amd64/iso-cd/ /var/lib/vz/template/iso/debian/ && find /var/lib/vz/template/iso/debian -type f -iregex '.*/debian-[0-9.]*-amd64-netinst.iso' -exec ln -sf {} /var/lib/vz/template/iso/debian-stable-amd64-netinst.iso \\;"
   register: rsync_output
diff --git a/roles/proxmox-debian-images/templates/cron.d/debian-images.j2 b/roles/proxmox-debian-images/templates/cron.d/debian-images.j2
index 3383db071290ea0e126e92c80cfc4e2bf8fbe535..dafd9411d3f4bde6069f70823082110356e6ce09 100644
--- a/roles/proxmox-debian-images/templates/cron.d/debian-images.j2
+++ b/roles/proxmox-debian-images/templates/cron.d/debian-images.j2
@@ -1,3 +1,6 @@
 {{ ansible_header | comment }}
 
 {{ debian_images.cron_timer }} root rsync --info=name1 --dirs --compress --times --update --delete-after --delete-excluded --include 'debian-[0-9]*-amd64-netinst.iso' --exclude '*' rsync://{{ debian_images.rsync_host }}/{{ debian_images.rsync_module }}/cdimage-debian/release/current/amd64/iso-cd/ /var/lib/vz/template/iso/debian/ && find /var/lib/vz/template/iso/debian -type f -iregex '.*/debian-[0-9.]*-amd64-netinst.iso' -exec ln -sf {} /var/lib/vz/template/iso/debian-stable-amd64-netinst.iso \;
+{% if debian_images.include_extra_images %}
+{{ debian_images.cron_timer }} root rsync --info=name1 --dirs --compress --times --update --delete-after --delete-excluded --include 'archlinux-*-x86_64.iso' --exclude '*' rsync://eclat.adm.crans.org/mirror/cdimage-archlinux/latest/ /var/lib/vz/template/iso/archlinux/ && find /var/lib/vz/template/iso/archlinux -type f -iregex '.*/archlinux-.*-x86_64.iso' -exec ln -sf {} /var/lib/vz/template/iso/archlinux-latest-x86_64.iso \; > /dev/null
+{% endif %}