diff --git a/Justfile b/Justfile
index 740b29cc1..1558ebef8 100644
--- a/Justfile
+++ b/Justfile
@@ -201,7 +201,7 @@ create dist flavor:
 		--vcpus {{vcpus}} \
 		--ram {{ram}} \
 		--machine q35 \
-		--boot uefi \
+		{{ if dist == "archlinux" { "" } else { "--boot uefi" } }} \
 		--memorybacking source.type=memfd,access.mode=shared \
 		--disk path={{vm}}/{{prefix}}{{dist}}-{{flavor}}.qcow2,format=qcow2,bus=virtio \
 		--filesystem "`pwd`,0a31bc478ef8e2461a4b1cc10a24cc4",accessmode=passthrough,driver.type=virtiofs \
diff --git a/tests/cloud-init/archlinux-cosmic.user-data.yml b/tests/cloud-init/archlinux-cosmic.user-data.yml
index 70d446076..be623e625 100644
--- a/tests/cloud-init/archlinux-cosmic.user-data.yml
+++ b/tests/cloud-init/archlinux-cosmic.user-data.yml
@@ -3,9 +3,7 @@
 packages:
   # Install core packages
   - apparmor
-  - audit
   - base-devel
-  - firewalld
   - qemu-guest-agent
   - rng-tools
   - spice-vdagent
@@ -26,14 +24,14 @@ packages:
   - cups-pdf
   - system-config-printer
 
-  # Install Graphical Interface
-  - cosmic
-
   # Install Applications
   - firefox
   - chromium
   - terminator
 
+  # Install Graphical Interface
+  - cosmic
+
 runcmd:
   # Regenerate grub.cfg
   - grub-mkconfig -o /boot/grub/grub.cfg
@@ -53,20 +51,6 @@ runcmd:
   - systemctl enable systemd-timesyncd.service
 
 write_files:
-  # Enable AppArmor in kernel parameters
-  - path: /etc/default/grub
-    append: true
-    content: |
-      GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf apparmor.debug=1"
-
-  # Set some bash aliases
-  - path: /etc/skel/.bashrc
-    append: true
-    content: |
-      [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases
-
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
+  - *grub-enable-apparmor # Enable AppArmor in kernel parameters
+  - *setup-bash-aliases   # Set some bash aliases
+  - *shared-directory     # Setup shared directory
diff --git a/tests/cloud-init/archlinux-gnome.user-data.yml b/tests/cloud-init/archlinux-gnome.user-data.yml
index 1fa1c9c1d..c292993c1 100644
--- a/tests/cloud-init/archlinux-gnome.user-data.yml
+++ b/tests/cloud-init/archlinux-gnome.user-data.yml
@@ -4,7 +4,6 @@ packages:
   # Install core packages
   - apparmor
   - base-devel
-  - firewalld
   - qemu-guest-agent
   - rng-tools
   - spice-vdagent
@@ -25,17 +24,17 @@ packages:
   - cups-pdf
   - system-config-printer
 
+  # Install Applications
+  - firefox
+  - chromium
+  - terminator
+
   # Install Graphical Interface
   - gnome
   - gnome-extra
   - seahorse
   - alacarte
 
-  # Install Applications
-  - firefox
-  - chromium
-  - terminator
-
 runcmd:
   # Regenerate grub.cfg
   - grub-mkconfig -o /boot/grub/grub.cfg
@@ -55,20 +54,6 @@ runcmd:
   - systemctl enable systemd-timesyncd.service
 
 write_files:
-  # Enable AppArmor in kernel parameters
-  - path: /etc/default/grub
-    append: true
-    content: |
-      GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf apparmor.debug=1"
-
-  # Set some bash aliases
-  - path: /etc/skel/.bashrc
-    append: true
-    content: |
-      [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases
-
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
+  - *grub-enable-apparmor # Enable AppArmor in kernel parameters
+  - *setup-bash-aliases   # Set some bash aliases
+  - *shared-directory     # Setup shared directory
diff --git a/tests/cloud-init/archlinux-kde.user-data.yml b/tests/cloud-init/archlinux-kde.user-data.yml
index 5953eab2e..c89b3a25c 100644
--- a/tests/cloud-init/archlinux-kde.user-data.yml
+++ b/tests/cloud-init/archlinux-kde.user-data.yml
@@ -4,7 +4,6 @@ packages:
   # Install core packages
   - apparmor
   - base-devel
-  - firewalld
   - qemu-guest-agent
   - rng-tools
   - spice-vdagent
@@ -25,6 +24,11 @@ packages:
   - cups-pdf
   - system-config-printer
 
+  # Install Applications
+  - firefox
+  - chromium
+  - terminator
+
   # Install Graphical Interface
   - plasma-meta
   - sddm
@@ -33,11 +37,6 @@ packages:
   - konsole
   - okular
 
-  # Install Applications
-  - firefox
-  - chromium
-  - terminator
-
 runcmd:
   # Regenerate grub.cfg
   - grub-mkconfig -o /boot/grub/grub.cfg
@@ -57,20 +56,6 @@ runcmd:
   - systemctl enable systemd-timesyncd.service
 
 write_files:
-  # Enable AppArmor in kernel parameters
-  - path: /etc/default/grub
-    append: true
-    content: |
-      GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf apparmor.debug=1"
-
-  # Set some bash aliases
-  - path: /etc/skel/.bashrc
-    append: true
-    content: |
-      [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases
-
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
+  - *grub-enable-apparmor # Enable AppArmor in kernel parameters
+  - *setup-bash-aliases   # Set some bash aliases
+  - *shared-directory     # Setup shared directory
diff --git a/tests/cloud-init/archlinux-server.user-data.yml b/tests/cloud-init/archlinux-server.user-data.yml
index e0edaca16..2b3567171 100644
--- a/tests/cloud-init/archlinux-server.user-data.yml
+++ b/tests/cloud-init/archlinux-server.user-data.yml
@@ -1,22 +1,6 @@
 #cloud-config
 
-packages:
-  # Install core packages
-  - apparmor
-  - base-devel
-  - qemu-guest-agent
-  - rng-tools
-  - spice-vdagent
-
-  # Install usefull core packages
-  - bash-completion
-  - git
-  - htop
-  - man
-  - pass
-  - python-notify2
-  - vim
-  - wget
+packages: *core-packages
 
 runcmd:
   # Regenerate grub.cfg
@@ -34,34 +18,7 @@ runcmd:
   - systemctl enable systemd-timesyncd.service
 
 write_files:
-  # Enable AppArmor in kernel parameters
-  - path: /etc/default/grub
-    append: true
-    content: |
-      GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf apparmor.debug=1"
-
-  # Set some bash aliases
-  - path: /etc/skel/.bashrc
-    append: true
-    content: |
-      [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases
-
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
-
-  # Network configuration
-  - path: /etc/systemd/network/20-wired.network
-    owner: "root:root"
-    permissions: "0644"
-    content: |
-      [Match]
-      Name=en*
-
-      [Network]
-      DHCP=yes
-
-      [DHCPv4]
-      RouteMetric=10
+  - *grub-enable-apparmor # Enable AppArmor in kernel parameters
+  - *setup-bash-aliases   # Set some bash aliases
+  - *shared-directory     # Setup shared directory
+  - *systemd-netword      # Network configuration for server
diff --git a/tests/cloud-init/archlinux-xfce.user-data.yml b/tests/cloud-init/archlinux-xfce.user-data.yml
index e9f4a78a6..54329bfb8 100644
--- a/tests/cloud-init/archlinux-xfce.user-data.yml
+++ b/tests/cloud-init/archlinux-xfce.user-data.yml
@@ -4,7 +4,6 @@ packages:
   # Install core packages
   - apparmor
   - base-devel
-  - firewalld
   - qemu-guest-agent
   - rng-tools
   - spice-vdagent
@@ -25,17 +24,17 @@ packages:
   - cups-pdf
   - system-config-printer
 
+  # Install Applications
+  - firefox
+  - chromium
+  - terminator
+
   # Install Graphical Interface
   - xfce4
   - xfce4-goodies
   - lightdm
   - lightdm-gtk-greeter
 
-  # Install Applications
-  - firefox
-  - chromium
-  - terminator
-
 runcmd:
   # Regenerate grub.cfg
   - grub-mkconfig -o /boot/grub/grub.cfg
@@ -55,20 +54,6 @@ runcmd:
   - systemctl enable systemd-timesyncd.service
 
 write_files:
-  # Enable AppArmor in kernel parameters
-  - path: /etc/default/grub
-    append: true
-    content: |
-      GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf"
-
-  # Set some bash aliases
-  - path: /etc/skel/.bashrc
-    append: true
-    content: |
-      [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases
-
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
+  - *grub-enable-apparmor # Enable AppArmor in kernel parameters
+  - *setup-bash-aliases   # Set some bash aliases
+  - *shared-directory     # Setup shared directory
diff --git a/tests/cloud-init/archlinux.yml b/tests/cloud-init/archlinux.yml
new file mode 100644
index 000000000..d860f1a1e
--- /dev/null
+++ b/tests/cloud-init/archlinux.yml
@@ -0,0 +1,47 @@
+#cloud-config
+
+# Core packages for Archlinux
+core-packages: &core-packages
+  # Install core packages
+  - apparmor
+  - base-devel
+  - qemu-guest-agent
+  - rng-tools
+  - spice-vdagent
+
+  # Install usefull core packages
+  - bash-completion
+  - git
+  - htop
+  - man
+  - pass
+  - python-notify2
+  - vim
+  - wget
+
+# Core desktop packages for Archlinux
+desktop-packages: &desktop-packages
+  # Install basic services
+  - networkmanager
+  - cups
+  - cups-pdf
+  - system-config-printer
+
+  # Install Applications
+  - firefox
+  - chromium
+  - terminator
+
+# Enable AppArmor in kernel parameters
+grub-enable-apparmor: &grub-enable-apparmor
+  path: /etc/default/grub
+  append: true
+  content: |
+    GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT lsm=landlock,lockdown,yama,integrity,apparmor,bpf apparmor.debug=1"
+
+# Set some bash aliases
+setup-bash-aliases: &setup-bash-aliases
+  path: /etc/skel/.bashrc
+  append: true
+  content: |
+    [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases
diff --git a/tests/cloud-init/common.yml b/tests/cloud-init/common.yml
index ac619c879..2048e5368 100644
--- a/tests/cloud-init/common.yml
+++ b/tests/cloud-init/common.yml
@@ -15,3 +15,25 @@ users:
 package_update: true
 package_upgrade: true
 package_reboot_if_required: false
+
+# Mount shared directory
+shared-directory: &shared-directory
+  path: /etc/fstab
+  append: true
+  content: |
+    0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
+
+# Network configuration for server
+systemd-netword: &systemd-netword
+  path: /etc/systemd/network/20-wired.network
+  owner: "root:root"
+  permissions: "0644"
+  content: |
+    [Match]
+    Name=en*
+
+    [Network]
+    DHCP=yes
+
+    [DHCPv4]
+    RouteMetric=10
diff --git a/tests/cloud-init/debian.yml b/tests/cloud-init/debian.yml
new file mode 100644
index 000000000..cead162a4
--- /dev/null
+++ b/tests/cloud-init/debian.yml
@@ -0,0 +1,64 @@
+#cloud-config
+
+# Core packages for Debian
+core-packages: &core-packages
+  - apparmor-profiles
+  - auditd
+  - build-essential
+  - config-package-dev
+  - debhelper
+  - devscripts
+  - htop
+  - qemu-guest-agent
+  - rsync
+  - vim
+
+gnome-packages: &desktop-packages
+  # Core packages for Debian
+  - apparmor-profiles
+  - auditd
+  - build-essential
+  - config-package-dev
+  - debhelper
+  - devscripts
+  - htop
+  - qemu-guest-agent
+  - rsync
+  - vim
+
+  # Gnome packages for Debian
+  - spice-vdagent
+  - task-gnome-desktop
+  - terminator
+
+kde-packages: &kubuntu-packages
+  # Core packages for Debian
+  - apparmor-profiles
+  - auditd
+  - build-essential
+  - config-package-dev
+  - debhelper
+  - devscripts
+  - htop
+  - qemu-guest-agent
+  - rsync
+  - vim
+
+  # KDE packages for Debian
+  - spice-vdagent
+  - task-kde-desktop
+  - terminator
+
+debian12-runcmd: &debian12-runcmd
+  - apt-get update -y
+  - apt-get install -y -t bookworm-backports golang-go
+
+debian13-runcmd: &debian13-runcmd
+  - apt-get update -y
+  - apt-get install -y golang-go
+
+# Add backports repository
+debian12-backports: &debian12-backports
+  path: /etc/apt/sources.list
+  append: true
+  content: deb http://deb.debian.org/debian bookworm-backports main contrib non-free
diff --git a/tests/cloud-init/debian12-gnome.user-data.yml b/tests/cloud-init/debian12-gnome.user-data.yml
index 5ce6cedf5..fbb3d1232 100644
--- a/tests/cloud-init/debian12-gnome.user-data.yml
+++ b/tests/cloud-init/debian12-gnome.user-data.yml
@@ -1,45 +1,10 @@
 #cloud-config
 
-packages:
-  - apparmor-profiles
-  - auditd
-  - build-essential
-  - config-package-dev
-  - debhelper
-  - devscripts
-  - htop
-  - qemu-guest-agent
-  - rsync
-  - spice-vdagent
-  - task-gnome-desktop
-  - vim
+packages: *gnome-packages
 
-runcmd:
-  - apt-get update -y
-  - apt-get install -y -t bookworm-backports golang-go
+runcmd: *debian12-runcmd
 
 write_files:
-  # Add backports repository
-  - path: /etc/apt/sources.list
-    append: true
-    content: deb http://deb.debian.org/debian bookworm-backports main contrib non-free
-
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
-
-  # Network configuration
-  - path: /etc/systemd/network/20-wired.network
-    owner: "root:root"
-    permissions: "0644"
-    content: |
-      [Match]
-      Name=en*
-
-      [Network]
-      DHCP=yes
-
-      [DHCPv4]
-      RouteMetric=10
+  - *debian12-backports  # Add backports repository
+  - *shared-directory    # Setup shared directory
+  - *systemd-netword     # Network configuration for server
diff --git a/tests/cloud-init/debian12-server.user-data.yml b/tests/cloud-init/debian12-server.user-data.yml
index aef29f579..cec721285 100644
--- a/tests/cloud-init/debian12-server.user-data.yml
+++ b/tests/cloud-init/debian12-server.user-data.yml
@@ -1,43 +1,10 @@
 #cloud-config
 
-packages:
-  - apparmor-profiles
-  - auditd
-  - build-essential
-  - config-package-dev
-  - debhelper
-  - devscripts
-  - htop
-  - qemu-guest-agent
-  - rsync
-  - vim
+packages: *core-packages
 
-runcmd:
-  - apt-get update -y
-  - apt-get install -y -t bookworm-backports golang-go
+runcmd: *debian12-runcmd
 
 write_files:
-  # Add backports repository
-  - path: /etc/apt/sources.list
-    append: true
-    content: deb http://deb.debian.org/debian bookworm-backports main contrib non-free
-
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
-
-  # Network configuration
-  - path: /etc/systemd/network/20-wired.network
-    owner: "root:root"
-    permissions: "0644"
-    content: |
-      [Match]
-      Name=en*
-
-      [Network]
-      DHCP=yes
-
-      [DHCPv4]
-      RouteMetric=10
+  - *debian12-backports  # Add backports repository
+  - *shared-directory    # Setup shared directory
+  - *systemd-netword     # Network configuration for server
diff --git a/tests/cloud-init/debian13-server.user-data.yml b/tests/cloud-init/debian13-server.user-data.yml
index 1400584ba..692548770 100644
--- a/tests/cloud-init/debian13-server.user-data.yml
+++ b/tests/cloud-init/debian13-server.user-data.yml
@@ -1,36 +1,9 @@
 #cloud-config
 
-packages:
-  - apparmor-profiles
-  - auditd
-  - build-essential
-  - config-package-dev
-  - debhelper
-  - devscripts
-  - golang-go
-  - htop
-  - qemu-guest-agent
-  - rsync
-  - vim
+packages: *core-packages
+
+runcmd: *debian13-runcmd
 
 write_files:
-
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
-
-  # Network configuration
-  - path: /etc/systemd/network/20-wired.network
-    owner: "root:root"
-    permissions: "0644"
-    content: |
-      [Match]
-      Name=en*
-
-      [Network]
-      DHCP=yes
-
-      [DHCPv4]
-      RouteMetric=10
+  - *shared-directory    # Setup shared directory
+  - *systemd-netword     # Network configuration for server
diff --git a/tests/cloud-init/opensuse-gnome.user-data.yml b/tests/cloud-init/opensuse-gnome.user-data.yml
index 406b4445d..3ab5a6c08 100644
--- a/tests/cloud-init/opensuse-gnome.user-data.yml
+++ b/tests/cloud-init/opensuse-gnome.user-data.yml
@@ -1,21 +1,6 @@
 #cloud-config
 
-packages:
-  - apparmor-profiles
-  - bash-completion
-  - distribution-release
-  - git
-  - go
-  - golang-packaging
-  - htop
-  - make
-  - rpmbuild
-  - rsync
-  - vim
+packages: *core-packages
 
 write_files:
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
+  - *shared-directory  # Setup shared directory
diff --git a/tests/cloud-init/opensuse-kde.user-data.yml b/tests/cloud-init/opensuse-kde.user-data.yml
index 406b4445d..3ab5a6c08 100644
--- a/tests/cloud-init/opensuse-kde.user-data.yml
+++ b/tests/cloud-init/opensuse-kde.user-data.yml
@@ -1,21 +1,6 @@
 #cloud-config
 
-packages:
-  - apparmor-profiles
-  - bash-completion
-  - distribution-release
-  - git
-  - go
-  - golang-packaging
-  - htop
-  - make
-  - rpmbuild
-  - rsync
-  - vim
+packages: *core-packages
 
 write_files:
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
+  - *shared-directory  # Setup shared directory
diff --git a/tests/cloud-init/opensuse-server.user-data.yml b/tests/cloud-init/opensuse-server.user-data.yml
index 7699fb074..98b78ec80 100644
--- a/tests/cloud-init/opensuse-server.user-data.yml
+++ b/tests/cloud-init/opensuse-server.user-data.yml
@@ -1,36 +1,7 @@
 #cloud-config
 
-packages:
-  - apparmor-profiles
-  - bash-completion
-  - distribution-release
-  - git
-  - go
-  - golang-packaging
-  - htop
-  - make
-  - rpmbuild
-  - rsync
-  - vim
+packages: *core-packages
 
 write_files:
-
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
-
-  # Network configuration
-  - path: /etc/systemd/network/20-wired.network
-    owner: "root:root"
-    permissions: "0644"
-    content: |
-      [Match]
-      Name=en*
-
-      [Network]
-      DHCP=yes
-
-      [DHCPv4]
-      RouteMetric=10
+  - *shared-directory  # Setup shared directory
+  - *systemd-netword   # Network configuration for server
diff --git a/tests/cloud-init/opensuse.yml b/tests/cloud-init/opensuse.yml
new file mode 100644
index 000000000..1adf2b6eb
--- /dev/null
+++ b/tests/cloud-init/opensuse.yml
@@ -0,0 +1,16 @@
+#cloud-config
+
+# Core packages for OpenSUSE
+core-packages: &core-packages
+  - apparmor-profiles
+  - bash-completion
+  - distribution-release
+  - git
+  - go
+  - golang-packaging
+  - htop
+  - make
+  - rpmbuild
+  - rsync
+  - vim
+
diff --git a/tests/cloud-init/ubuntu.yml b/tests/cloud-init/ubuntu.yml
new file mode 100644
index 000000000..ba640e3af
--- /dev/null
+++ b/tests/cloud-init/ubuntu.yml
@@ -0,0 +1,76 @@
+#cloud-config
+
+# Core packages for Ubuntu
+core-packages: &core-packages
+  - apparmor-profiles
+  - auditd
+  - build-essential
+  - config-package-dev
+  - debhelper
+  - devscripts
+  - golang-go
+  - htop
+  - qemu-guest-agent
+  - rsync
+  - vim
+
+desktop-packages: &desktop-packages
+  # Core packages for Ubuntu
+  - apparmor-profiles
+  - auditd
+  - build-essential
+  - config-package-dev
+  - debhelper
+  - devscripts
+  - golang-go
+  - htop
+  - qemu-guest-agent
+  - rsync
+  - vim
+
+  # Desktop packages for Ubuntu
+  - spice-vdagent
+  - terminator
+  - ubuntu-desktop
+
+kubuntu-packages: &kubuntu-packages
+  # Core packages for Ubuntu
+  - apparmor-profiles
+  - auditd
+  - build-essential
+  - config-package-dev
+  - debhelper
+  - devscripts
+  - golang-go
+  - htop
+  - qemu-guest-agent
+  - rsync
+  - vim
+
+  # Desktop packages for Ubuntu
+  - spice-vdagent
+  - terminator
+  - kubuntu-desktop
+
+desktop-runcmd: &desktop-runcmd
+  # Add missing snap packages
+  - snap install snap-store
+  - snap install snapd-desktop-integration
+  - snap install --edge desktop-security-center
+
+  # Remove default filesystem and related tools not used with the suggested
+  # storage layout. These may yet be required if different partitioning schemes
+  # are used.
+  - apt-get -y purge btrfs-progs xfsprogs
+
+  # Remove other packages present by default in Ubuntu Server but not
+  # normally present in Ubuntu Desktop.
+  - >-
+    apt-get -y purge
+      byobu dmeventd finalrd gawk kpartx landscape-common lxd-agent-loader
+      mdadm motd-news-config ncurses-term open-iscsi open-vm-tools
+      screen sg3-utils sosreport ssh-import-id sssd tmux
+
+  # Finally, remove things only installed as dependencies of other things
+  # we have already removed.
+  - apt-get -y autoremove
diff --git a/tests/cloud-init/ubuntu24-desktop.user-data.yml b/tests/cloud-init/ubuntu24-desktop.user-data.yml
index d1b1f169c..7f4183d49 100644
--- a/tests/cloud-init/ubuntu24-desktop.user-data.yml
+++ b/tests/cloud-init/ubuntu24-desktop.user-data.yml
@@ -1,47 +1,8 @@
 #cloud-config
 
-# Based on https://github.com/canonical/autoinstall-desktop
+packages: *desktop-packages
 
-packages:
-  - apparmor-profiles
-  - build-essential
-  - config-package-dev
-  - debhelper
-  - devscripts
-  - golang-go
-  - linux-generic-hwe-24.04
-  - qemu-guest-agent
-  - rsync
-  - spice-vdagent
-  - terminator
-  - ubuntu-desktop
-  - vim
-
-runcmd:
-  # Add missing snap packages
-  - snap install snap-store
-  - snap install snapd-desktop-integration
-
-  # Remove default filesystem and related tools not used with the suggested
-  # storage layout. These may yet be required if different partitioning schemes
-  # are used.
-  - apt-get -y purge btrfs-progs xfsprogs
-
-  # Remove other packages present by default in Ubuntu Server but not
-  # normally present in Ubuntu Desktop.
-  - >-
-    apt-get -y purge
-      byobu dmeventd finalrd gawk kpartx landscape-common lxd-agent-loader
-      mdadm motd-news-config ncurses-term open-iscsi open-vm-tools
-      screen sg3-utils sosreport ssh-import-id sssd tmux
-
-  # Finally, remove things only installed as dependencies of other things
-  # we have already removed.
-  - apt-get -y autoremove
+runcmd: *desktop-runcmd
 
 write_files:
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
+  - *shared-directory  # Setup shared directory
diff --git a/tests/cloud-init/ubuntu24-kubuntu.user-data.yml b/tests/cloud-init/ubuntu24-kubuntu.user-data.yml
new file mode 100644
index 000000000..d4139c2f7
--- /dev/null
+++ b/tests/cloud-init/ubuntu24-kubuntu.user-data.yml
@@ -0,0 +1,8 @@
+#cloud-config
+
+packages: *kubuntu-packages
+
+runcmd: *desktop-runcmd
+
+write_files:
+  - *shared-directory  # Setup shared directory
diff --git a/tests/cloud-init/ubuntu24-server.user-data.yml b/tests/cloud-init/ubuntu24-server.user-data.yml
index 8e9c7bd38..98b78ec80 100644
--- a/tests/cloud-init/ubuntu24-server.user-data.yml
+++ b/tests/cloud-init/ubuntu24-server.user-data.yml
@@ -1,35 +1,7 @@
 #cloud-config
 
-packages:
-  - apparmor-profiles
-  - auditd
-  - build-essential
-  - config-package-dev
-  - debhelper
-  - devscripts
-  - golang-go
-  - htop
-  - qemu-guest-agent
-  - rsync
-  - vim
+packages: *core-packages
 
 write_files:
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
-
-  # Network configuration
-  - path: /etc/systemd/network/20-wired.network
-    owner: "root:root"
-    permissions: "0644"
-    content: |
-      [Match]
-      Name=en*
-
-      [Network]
-      DHCP=yes
-
-      [DHCPv4]
-      RouteMetric=10
+  - *shared-directory  # Setup shared directory
+  - *systemd-netword   # Network configuration for server
diff --git a/tests/cloud-init/ubuntu25-desktop.user-data.yml b/tests/cloud-init/ubuntu25-desktop.user-data.yml
index 881e9b4e9..7f4183d49 100644
--- a/tests/cloud-init/ubuntu25-desktop.user-data.yml
+++ b/tests/cloud-init/ubuntu25-desktop.user-data.yml
@@ -1,47 +1,8 @@
 #cloud-config
 
-# Based on https://github.com/canonical/autoinstall-desktop
+packages: *desktop-packages
 
-packages:
-  - apparmor-profiles
-  - build-essential
-  - config-package-dev
-  - debhelper
-  - devscripts
-  - golang-go
-  - linux-generic-hwe-24.04
-  - qemu-guest-agent
-  - rsync
-  - spice-vdagent
-  - terminator
-  - ubuntu-desktop
-  - vim
-
-runcmd:
-  - snap install snap-store
-  - snap install snapd-desktop-integration
-  - snap install --edge desktop-security-center
-
-  # Remove default filesystem and related tools not used with the suggested
-  # storage layout. These may yet be required if different partitioning schemes
-  # are used.
-  - apt-get -y purge btrfs-progs xfsprogs
-
-  # Remove other packages present by default in Ubuntu Server but not
-  # normally present in Ubuntu Desktop.
-  - >-
-    apt-get -y purge
-      byobu dmeventd finalrd gawk kpartx landscape-common lxd-agent-loader
-      mdadm motd-news-config ncurses-term open-iscsi open-vm-tools
-      screen sg3-utils sosreport ssh-import-id sssd tmux
-
-  # Finally, remove things only installed as dependencies of other things
-  # we have already removed.
-  - apt-get -y autoremove
+runcmd: *desktop-runcmd
 
 write_files:
-  # Setup shared directory
-  - path: /etc/fstab
-    append: true
-    content: |
-      0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d  virtiofs defaults  0  1
+  - *shared-directory  # Setup shared directory
diff --git a/tests/cloud-init/ubuntu25-server.user-data.yml b/tests/cloud-init/ubuntu25-server.user-data.yml
new file mode 100644
index 000000000..98b78ec80
--- /dev/null
+++ b/tests/cloud-init/ubuntu25-server.user-data.yml
@@ -0,0 +1,7 @@
+#cloud-config
+
+packages: *core-packages
+
+write_files:
+  - *shared-directory  # Setup shared directory
+  - *systemd-netword   # Network configuration for server
diff --git a/tests/packer/builds.pkr.hcl b/tests/packer/builds.pkr.hcl
index 674a295b1..48a5fafb6 100644
--- a/tests/packer/builds.pkr.hcl
+++ b/tests/packer/builds.pkr.hcl
@@ -32,7 +32,7 @@ source "qemu" "default" {
   cd_label           = "cidata"
   cd_content = {
     "meta-data" = ""
-    "user-data" = format("%s\n%s",
+    "user-data" = format("%s\n%s\n%s",
       templatefile("${path.cwd}/tests/cloud-init/common.yml",
         {
           username = "${var.username}"
@@ -41,6 +41,7 @@ source "qemu" "default" {
           hostname = "${local.name}"
         }
       ),
+      file("${path.cwd}/tests/cloud-init/${regex_replace(var.dist, "[0-9]*$", "")}.yml"),
       file("${path.cwd}/tests/cloud-init/${var.dist}-${var.flavor}.user-data.yml")
     )
   }
@@ -70,10 +71,10 @@ build {
       "while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for Cloud-Init...'; sleep 20; done",
 
       # Ensure cloud-init is successful
-      "cloud-init status",
+      # "cloud-init status",
 
       # Remove logs and artifacts so cloud-init can re-run
-      "cloud-init clean",
+      # "cloud-init clean",
 
       # Install local files and config
       "bash /tmp/init.sh",