diff --git a/tests/cloud-init/archlinux-cosmic.user-data.yml b/tests/cloud-init/archlinux-cosmic.user-data.yml
index d95381b9..70d44607 100644
--- a/tests/cloud-init/archlinux-cosmic.user-data.yml
+++ b/tests/cloud-init/archlinux-cosmic.user-data.yml
@@ -1,20 +1,5 @@
 #cloud-config
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   # Install core packages
   - apparmor
diff --git a/tests/cloud-init/archlinux-gnome.user-data.yml b/tests/cloud-init/archlinux-gnome.user-data.yml
index a2a3d78b..1fa1c9c1 100644
--- a/tests/cloud-init/archlinux-gnome.user-data.yml
+++ b/tests/cloud-init/archlinux-gnome.user-data.yml
@@ -1,20 +1,5 @@
 #cloud-config
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   # Install core packages
   - apparmor
diff --git a/tests/cloud-init/archlinux-kde.user-data.yml b/tests/cloud-init/archlinux-kde.user-data.yml
index eea5df04..5953eab2 100644
--- a/tests/cloud-init/archlinux-kde.user-data.yml
+++ b/tests/cloud-init/archlinux-kde.user-data.yml
@@ -1,20 +1,5 @@
 #cloud-config
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   # Install core packages
   - apparmor
diff --git a/tests/cloud-init/archlinux-server.user-data.yml b/tests/cloud-init/archlinux-server.user-data.yml
index 4a7f1737..e0edaca1 100644
--- a/tests/cloud-init/archlinux-server.user-data.yml
+++ b/tests/cloud-init/archlinux-server.user-data.yml
@@ -1,20 +1,5 @@
 #cloud-config
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   # Install core packages
   - apparmor
diff --git a/tests/cloud-init/archlinux-xfce.user-data.yml b/tests/cloud-init/archlinux-xfce.user-data.yml
index 07d87364..e9f4a78a 100644
--- a/tests/cloud-init/archlinux-xfce.user-data.yml
+++ b/tests/cloud-init/archlinux-xfce.user-data.yml
@@ -1,20 +1,5 @@
 #cloud-config
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   # Install core packages
   - apparmor
diff --git a/tests/cloud-init/common.yml b/tests/cloud-init/common.yml
new file mode 100644
index 00000000..ac619c87
--- /dev/null
+++ b/tests/cloud-init/common.yml
@@ -0,0 +1,17 @@
+#cloud-config
+
+hostname: ${hostname}
+
+ssh_pwauth: true
+users:
+  - name: ${username}
+    plain_text_passwd: ${password}
+    shell: /bin/bash
+    ssh_authorized_keys:
+      - ${ssh_key}
+    lock_passwd: false
+    sudo: ALL=(ALL) NOPASSWD:ALL
+
+package_update: true
+package_upgrade: true
+package_reboot_if_required: false
diff --git a/tests/cloud-init/debian-gnome.user-data.yml b/tests/cloud-init/debian12-gnome.user-data.yml
similarity index 74%
rename from tests/cloud-init/debian-gnome.user-data.yml
rename to tests/cloud-init/debian12-gnome.user-data.yml
index 1c48eb2e..5ce6cedf 100644
--- a/tests/cloud-init/debian-gnome.user-data.yml
+++ b/tests/cloud-init/debian12-gnome.user-data.yml
@@ -1,20 +1,5 @@
 #cloud-config
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   - apparmor-profiles
   - auditd
diff --git a/tests/cloud-init/debian-kde.user-data.yml b/tests/cloud-init/debian12-kde.user-data.yml
similarity index 68%
rename from tests/cloud-init/debian-kde.user-data.yml
rename to tests/cloud-init/debian12-kde.user-data.yml
index e644414f..451068db 100644
--- a/tests/cloud-init/debian-kde.user-data.yml
+++ b/tests/cloud-init/debian12-kde.user-data.yml
@@ -1,20 +1,5 @@
 #cloud-config
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   - apparmor-profiles
   - auditd
diff --git a/tests/cloud-init/debian-server.user-data.yml b/tests/cloud-init/debian12-server.user-data.yml
similarity index 73%
rename from tests/cloud-init/debian-server.user-data.yml
rename to tests/cloud-init/debian12-server.user-data.yml
index 47e4d832..aef29f57 100644
--- a/tests/cloud-init/debian-server.user-data.yml
+++ b/tests/cloud-init/debian12-server.user-data.yml
@@ -1,20 +1,5 @@
 #cloud-config
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   - apparmor-profiles
   - auditd
diff --git a/tests/cloud-init/opensuse-gnome.user-data.yml b/tests/cloud-init/opensuse-gnome.user-data.yml
index 5e5b197b..406b4445 100644
--- a/tests/cloud-init/opensuse-gnome.user-data.yml
+++ b/tests/cloud-init/opensuse-gnome.user-data.yml
@@ -1,20 +1,5 @@
 #cloud-config
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   - apparmor-profiles
   - bash-completion
diff --git a/tests/cloud-init/opensuse-kde.user-data.yml b/tests/cloud-init/opensuse-kde.user-data.yml
index 5e5b197b..406b4445 100644
--- a/tests/cloud-init/opensuse-kde.user-data.yml
+++ b/tests/cloud-init/opensuse-kde.user-data.yml
@@ -1,20 +1,5 @@
 #cloud-config
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   - apparmor-profiles
   - bash-completion
diff --git a/tests/cloud-init/opensuse-server.user-data.yml b/tests/cloud-init/opensuse-server.user-data.yml
new file mode 100644
index 00000000..7699fb07
--- /dev/null
+++ b/tests/cloud-init/opensuse-server.user-data.yml
@@ -0,0 +1,36 @@
+#cloud-config
+
+packages:
+  - apparmor-profiles
+  - bash-completion
+  - distribution-release
+  - git
+  - go
+  - golang-packaging
+  - htop
+  - make
+  - rpmbuild
+  - rsync
+  - vim
+
+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
diff --git a/tests/cloud-init/ubuntu22-desktop.user-data.yml b/tests/cloud-init/ubuntu22-desktop.user-data.yml
index 75dc6349..5f4dc69f 100644
--- a/tests/cloud-init/ubuntu22-desktop.user-data.yml
+++ b/tests/cloud-init/ubuntu22-desktop.user-data.yml
@@ -2,21 +2,6 @@
 
 # Based on https://github.com/canonical/autoinstall-desktop
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   - apparmor-profiles
   - build-essential
diff --git a/tests/cloud-init/ubuntu24-desktop.user-data.yml b/tests/cloud-init/ubuntu24-desktop.user-data.yml
index 9f722536..7a71b0af 100644
--- a/tests/cloud-init/ubuntu24-desktop.user-data.yml
+++ b/tests/cloud-init/ubuntu24-desktop.user-data.yml
@@ -2,23 +2,6 @@
 
 # Based on https://github.com/canonical/autoinstall-desktop
 
-# https://github.com/canonical/ubuntu-desktop-provision/blob/main/README.md
-
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   - apparmor-profiles
   - build-essential
diff --git a/tests/cloud-init/ubuntu24-server.user-data.yml b/tests/cloud-init/ubuntu24-server.user-data.yml
index 96318214..8e9c7bd3 100644
--- a/tests/cloud-init/ubuntu24-server.user-data.yml
+++ b/tests/cloud-init/ubuntu24-server.user-data.yml
@@ -1,20 +1,5 @@
 #cloud-config
 
-hostname: ${hostname}
-
-ssh_pwauth: true
-users:
-  - name: ${username}
-    plain_text_passwd: ${password}
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ${ssh_key}
-    lock_passwd: false
-    sudo: ALL=(ALL) NOPASSWD:ALL
-
-package_update: true
-package_upgrade: true
-package_reboot_if_required: false
 packages:
   - apparmor-profiles
   - auditd