diff --git a/scripts/homelab/rpi111.sh b/scripts/homelab/bootstrap.sh
similarity index 75%
rename from scripts/homelab/rpi111.sh
rename to scripts/homelab/bootstrap.sh
index 844cd74..45634f2 100755
--- a/scripts/homelab/rpi111.sh
+++ b/scripts/homelab/bootstrap.sh
@@ -1,4 +1,8 @@
 DRIVE_NAME=$1
+HOST_NAME=$2
+
+USER_DATA=`cat user-data`
+echo "${USER_DATA/PCLOUD_HOSTNAME/$HOST_NAME}" > user-data-tmp
 
 sudo parted $DRIVE_NAME mklabel gpt
 sudo parted $DRIVE_NAME mkpart primary fat32 0% 1GB
@@ -13,7 +17,7 @@
 sudo mkdir /mnt/rootfs-img
 sudo mkdir /mnt/boot-drive
 sudo mkdir /mnt/rootfs-drive
-LOOP_DEVICE=$(sudo losetup -fP --show ubuntu-21.04-server-arm64-raspi.img)
+LOOP_DEVICE=$(sudo losetup -fP --show ubuntu-22.04.1-preinstalled-server-arm64+raspi.img)
 sudo mount -o noatime "${LOOP_DEVICE}p1" /mnt/boot-img
 sudo mount -o noatime "${LOOP_DEVICE}p2" /mnt/rootfs-img
 sudo mount -o noatime "${DRIVE_NAME}1" /mnt/boot-drive
@@ -21,9 +25,11 @@
 sudo rsync -axv /mnt/boot-img/ /mnt/boot-drive
 sudo rsync -axv /mnt/rootfs-img/ /mnt/rootfs-drive
 sudo touch /mnt/boot-drive/ssh
-sudo cp -f user-data-rpi111 /mnt/boot-drive/user-data
-sudo cp -f network-config-rpi111 /mnt/boot-drive/network-config
+sudo cp -f user-data-tmp /mnt/boot-drive/user-data
+sudo cp -f network-config /mnt/boot-drive/network-config
 sudo umount /mnt/boot-img
 sudo umount /mnt/rootfs-img
 sudo umount /mnt/boot-drive
 sudo umount /mnt/rootfs-drive
+
+rm user-data-tmp
diff --git a/scripts/homelab/network-config b/scripts/homelab/network-config
new file mode 100644
index 0000000..6e82a06
--- /dev/null
+++ b/scripts/homelab/network-config
@@ -0,0 +1,19 @@
+version: 2
+renderer: networkd
+ethernets:
+  eth0:
+    dhcp4: true
+#     addresses:
+#       - 192.168.0.111/24
+#     gateway4: 192.168.0.10
+#     nameservers:
+#       addresses: [8.8.8.8, 8.8.4.4]
+wifis:
+  wlan0:
+    dhcp4: true
+    dhcp6: false
+    # nameservers:
+    #   addresses: [8.8.8.8, 8.8.4.4]
+    access-points:
+      "28":
+        password: "0987654321"
diff --git a/scripts/homelab/network-config-rpi111 b/scripts/homelab/network-config-rpi111
deleted file mode 100644
index 5fafdc6..0000000
--- a/scripts/homelab/network-config-rpi111
+++ /dev/null
@@ -1,19 +0,0 @@
-version: 2
-renderer: networkd
-ethernets:
-  eth0:
-    dhcp4: true
-#     addresses:
-#       - 192.168.0.111/24
-#     gateway4: 192.168.0.10
-#     nameservers:
-#       addresses: [8.8.8.8, 8.8.4.4]
-# wifis:
-#   wlan0:
-#     dhcp4: yes
-#     dhcp6: no
-#     nameservers:
-#       addresses: [8.8.8.8, 8.8.4.4]
-#     access-points:
-#       "gl-iphone":
-#         password: "lekva12345"
diff --git a/scripts/homelab/network-config-rpi112 b/scripts/homelab/network-config-rpi112
deleted file mode 100644
index 7625bcc..0000000
--- a/scripts/homelab/network-config-rpi112
+++ /dev/null
@@ -1,10 +0,0 @@
-version: 2
-renderer: networkd
-ethernets:
-  eth0:
-    dhcp4: true
-    # addresses:
-    #   - 192.168.2.112/24
-    # gateway4: 192.168.2.100
-    # nameservers:
-    #   addresses: [8.8.8.8]
diff --git a/scripts/homelab/network-config-rpi113 b/scripts/homelab/network-config-rpi113
deleted file mode 100644
index fe2d6a9..0000000
--- a/scripts/homelab/network-config-rpi113
+++ /dev/null
@@ -1,10 +0,0 @@
-version: 2
-renderer: networkd
-ethernets:
-  eth0:
-    dhcp4: true
-    # addresses:
-    #   - 192.168.2.113/24
-    # gateway4: 192.168.2.100
-    # nameservers:
-    #   addresses: [8.8.8.8]
diff --git a/scripts/homelab/network-config-rpi114 b/scripts/homelab/network-config-rpi114
deleted file mode 100644
index 15027cd..0000000
--- a/scripts/homelab/network-config-rpi114
+++ /dev/null
@@ -1,10 +0,0 @@
-version: 2
-renderer: networkd
-ethernets:
-  eth0:
-    dhcp4: true
-    # addresses:
-    #   - 192.168.2.114/24
-    # gateway4: 192.168.2.100
-    # nameservers:
-    #   addresses: [8.8.8.8]
diff --git a/scripts/homelab/network-config-rpi115 b/scripts/homelab/network-config-rpi115
deleted file mode 100644
index 15027cd..0000000
--- a/scripts/homelab/network-config-rpi115
+++ /dev/null
@@ -1,10 +0,0 @@
-version: 2
-renderer: networkd
-ethernets:
-  eth0:
-    dhcp4: true
-    # addresses:
-    #   - 192.168.2.114/24
-    # gateway4: 192.168.2.100
-    # nameservers:
-    #   addresses: [8.8.8.8]
diff --git a/scripts/homelab/network-config-rpi116 b/scripts/homelab/network-config-rpi116
deleted file mode 100644
index 15027cd..0000000
--- a/scripts/homelab/network-config-rpi116
+++ /dev/null
@@ -1,10 +0,0 @@
-version: 2
-renderer: networkd
-ethernets:
-  eth0:
-    dhcp4: true
-    # addresses:
-    #   - 192.168.2.114/24
-    # gateway4: 192.168.2.100
-    # nameservers:
-    #   addresses: [8.8.8.8]
diff --git a/scripts/homelab/user-data b/scripts/homelab/user-data
new file mode 100644
index 0000000..435a8e0
--- /dev/null
+++ b/scripts/homelab/user-data
@@ -0,0 +1,26 @@
+#cloud-config
+hostname: PCLOUD_HOSTNAME
+manage_etc_hosts: true
+ssh_pwauth: false
+package_update: true
+package_upgrade: true
+growpart:
+  mode: false
+resize_rootfs: false
+users:
+  - name: pcloud
+    primary-group: users
+    groups: users, sudo
+    shell: /bin/bash
+    sudo: ALL=(ALL) NOPASSWD:ALL
+    ssh-import-id: None
+    lock_passwd: true
+    ssh-authorized-keys:
+      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC/ZRj0QJ0j+3udh0ANN9mJyEzrATZIOAHfNikDMpSHqrVbPZqpeHGbdYrSksCvXPXfissIZoYU4CCXX007jY0W6e1mPf1nObYh2eUT1dHo/8UtGaf9nYk+kEGU/k3utN4Uzkxa13IFh9pYERX+o0Ad3X5wh0vi5hjOBAJVKOCD9d3aipeR9piUb+qrkFDXf9fozMFn7D9nALkpJBVuGxwl/76f8K6hRxBEmPqZwIMfklzX15nRdLEcsGFJpYLYXsonbr1P3moMJFBBbQFv6M6JO9rrwA+swXpWMoScI7m/nziSEPLAb+ziv+/OyhqzeC9CQner73V0m8+2DmtcgTuSe1qHRtOScPyIjBfxoXaUx1IUkgq1NXt8k+EBO2mxnVpKdyDCvwT1Tb7088P8f8cSLtUOmUdEiAhB8bfQFprzm2KrlufenfhMvdvQPU4VfWlkQ4smLYt2yVaaXoxZMy5yD3X6LFurNXwee/Gn6di+DWqsASAOsmpsNgSCGhT8wxM= lekva@gl-mbp-m1-max.local
+packages:
+  - emacs
+  - open-iscsi
+  - linux-modules-extra-raspi
+runcmd:
+  - apt autoremove -y --purge snapd
+  - echo "\nalias e='emacs -nw'\n" >> /home/pcloud/.bash_profile
diff --git a/scripts/homelab/user-data-rpi111 b/scripts/homelab/user-data-rpi111
deleted file mode 100644
index cbeddf4..0000000
--- a/scripts/homelab/user-data-rpi111
+++ /dev/null
@@ -1,25 +0,0 @@
-#cloud-config
-hostname: rpi111
-manage_etc_hosts: true
-ssh_pwauth: false
-package_update: true
-package_upgrade: true
-growpart:
-  mode: false
-resize_rootfs: false
-users:
-  - name: pcloud
-    primary-group: users
-    groups: users, sudo
-    shell: /bin/bash
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    ssh-import-id: None
-    lock_passwd: true
-    ssh-authorized-keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDM3fYFTroCfHhT6GBUpD5vTvRPZSGi5rgBT8cvT75AKKPmuZRE+kUh4miwdw3jFT1VC5qrNqaE8Xrhppg+brVNt24lTgL9Pr5WW5mTa8Wbb3sWoCy93xv1B5TU7dUBQr/bB4FE1WeHIktkaBlEBssvOyf/IR0DR3N2rbaSWyS3zp+6+/Bk1powoXoOA7hvpwFmxYZggovATmoZoQAIqDO4W90MAR+U8c5E4jtJs3WHktlqwZff/csvrXHGCpIA2rtEbeHS6dOCx3uiBCsl/sTqaig9QmQZE260YtVTINRejFS0/mFXs9OpUEYa/yVH1x2k49Pp+sJjTgNOS5BiQLvuduL83vCehl5+IGonhJ6jZEu0L+g9YaPI2qsaIxPt4S69u3hys6DgxC0a/z+2azw75lV1pWHZ8HDJ8jq8TSOltMUQKgoiq6FE9ibFvy5bTJOLFlthEUCxLdd7Wna0Nx6zRcvr8q5dISYkNoLgxmUmCKisMaOdXkTBXUnZhWi1DNk= lekva@gl.local
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCxH+RJysdTkLM9wBwmcVDy5SNx5cZqsIcMxGd0366j+9e79Mz2mxrptK+btPzrJl9+rZxLiQCSQbvFKtxZ2H1w8AOl1qiTkDmKswsHjZU4Y8ID842MOuNSztSeUWfBUgUc+F9rDtBg4fW9I8dZuQvBVgwm2xRasLJKt5netmlnPutbc2S3UefSOkDUS0gUEJhyR8HD8tOeJFzbDWN0CnzBkO4QKwkty2yUi4WixlE66f+mZJdFzfQZ/NBHBwviYE2QzJdchE7pA61rtEVgQG/q2zVPM9nvNgyplxFOYtsHWIsiHMlWFDd8AXaio4B/iSNMgoyUKNUKpmegqWE8+XhAjdonbXZEs49digbdT+BhZc5AePllFlQ4eEtyG3HINcTp864W2Af3XFXEMo3i0dsfFJwuE2xaanC09ST6piDajNnslZiYx20cPaWN04Lowy3ISjztlt5nUY4kpMmf+Tu5VWQMmzrvUv9ANSGrRFV/yGvi3GtzuA2UqIEFnp9xPhTkTT0slzB5Dmbrw1AWEZN+K1fn6emHFj+xpFfWuVubEBFqSlxozTuUQeUrsTolW8nLR13Fy7ajHD/zzItGd8Edc6oipIbLv0IQJ2OKPpr0J70e6cfuiuJXQDEnj5v4zPMMVIgygUks9bYZ0AgWIl5kOFcr67Rc/okJnxlCSvgnaw== pi@raspberrypi
-packages:
-  - emacs
-runcmd:
-  - apt autoremove -y --purge snapd
-  - echo "\nalias e='emacs -nw'\n" >> /home/pcloud/.bash_profile
diff --git a/scripts/homelab/user-data-rpi112 b/scripts/homelab/user-data-rpi112
deleted file mode 100644
index a207df7..0000000
--- a/scripts/homelab/user-data-rpi112
+++ /dev/null
@@ -1,25 +0,0 @@
-#cloud-config
-hostname: rpi112
-manage_etc_hosts: true
-ssh_pwauth: false
-package_update: true
-package_upgrade: true
-growpart:
-  mode: false
-resize_rootfs: false
-users:
-  - name: pcloud
-    primary-group: users
-    groups: users, sudo
-    shell: /bin/bash
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    ssh-import-id: None
-    lock_passwd: true
-    ssh-authorized-keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDM3fYFTroCfHhT6GBUpD5vTvRPZSGi5rgBT8cvT75AKKPmuZRE+kUh4miwdw3jFT1VC5qrNqaE8Xrhppg+brVNt24lTgL9Pr5WW5mTa8Wbb3sWoCy93xv1B5TU7dUBQr/bB4FE1WeHIktkaBlEBssvOyf/IR0DR3N2rbaSWyS3zp+6+/Bk1powoXoOA7hvpwFmxYZggovATmoZoQAIqDO4W90MAR+U8c5E4jtJs3WHktlqwZff/csvrXHGCpIA2rtEbeHS6dOCx3uiBCsl/sTqaig9QmQZE260YtVTINRejFS0/mFXs9OpUEYa/yVH1x2k49Pp+sJjTgNOS5BiQLvuduL83vCehl5+IGonhJ6jZEu0L+g9YaPI2qsaIxPt4S69u3hys6DgxC0a/z+2azw75lV1pWHZ8HDJ8jq8TSOltMUQKgoiq6FE9ibFvy5bTJOLFlthEUCxLdd7Wna0Nx6zRcvr8q5dISYkNoLgxmUmCKisMaOdXkTBXUnZhWi1DNk= lekva@gl.local
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCxH+RJysdTkLM9wBwmcVDy5SNx5cZqsIcMxGd0366j+9e79Mz2mxrptK+btPzrJl9+rZxLiQCSQbvFKtxZ2H1w8AOl1qiTkDmKswsHjZU4Y8ID842MOuNSztSeUWfBUgUc+F9rDtBg4fW9I8dZuQvBVgwm2xRasLJKt5netmlnPutbc2S3UefSOkDUS0gUEJhyR8HD8tOeJFzbDWN0CnzBkO4QKwkty2yUi4WixlE66f+mZJdFzfQZ/NBHBwviYE2QzJdchE7pA61rtEVgQG/q2zVPM9nvNgyplxFOYtsHWIsiHMlWFDd8AXaio4B/iSNMgoyUKNUKpmegqWE8+XhAjdonbXZEs49digbdT+BhZc5AePllFlQ4eEtyG3HINcTp864W2Af3XFXEMo3i0dsfFJwuE2xaanC09ST6piDajNnslZiYx20cPaWN04Lowy3ISjztlt5nUY4kpMmf+Tu5VWQMmzrvUv9ANSGrRFV/yGvi3GtzuA2UqIEFnp9xPhTkTT0slzB5Dmbrw1AWEZN+K1fn6emHFj+xpFfWuVubEBFqSlxozTuUQeUrsTolW8nLR13Fy7ajHD/zzItGd8Edc6oipIbLv0IQJ2OKPpr0J70e6cfuiuJXQDEnj5v4zPMMVIgygUks9bYZ0AgWIl5kOFcr67Rc/okJnxlCSvgnaw== pi@raspberrypi
-packages:
-  - emacs
-runcmd:
-  - apt autoremove -y --purge snapd
-  - echo "\nalias e='emacs -nw'\n" >> /home/pcloud/.bash_profile
diff --git a/scripts/homelab/user-data-rpi113 b/scripts/homelab/user-data-rpi113
deleted file mode 100644
index 2b3ea3b..0000000
--- a/scripts/homelab/user-data-rpi113
+++ /dev/null
@@ -1,25 +0,0 @@
-#cloud-config
-hostname: rpi113
-manage_etc_hosts: true
-ssh_pwauth: false
-package_update: true
-package_upgrade: true
-growpart:
-  mode: false
-resize_rootfs: false
-users:
-  - name: pcloud
-    primary-group: users
-    groups: users, sudo
-    shell: /bin/bash
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    ssh-import-id: None
-    lock_passwd: true
-    ssh-authorized-keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDM3fYFTroCfHhT6GBUpD5vTvRPZSGi5rgBT8cvT75AKKPmuZRE+kUh4miwdw3jFT1VC5qrNqaE8Xrhppg+brVNt24lTgL9Pr5WW5mTa8Wbb3sWoCy93xv1B5TU7dUBQr/bB4FE1WeHIktkaBlEBssvOyf/IR0DR3N2rbaSWyS3zp+6+/Bk1powoXoOA7hvpwFmxYZggovATmoZoQAIqDO4W90MAR+U8c5E4jtJs3WHktlqwZff/csvrXHGCpIA2rtEbeHS6dOCx3uiBCsl/sTqaig9QmQZE260YtVTINRejFS0/mFXs9OpUEYa/yVH1x2k49Pp+sJjTgNOS5BiQLvuduL83vCehl5+IGonhJ6jZEu0L+g9YaPI2qsaIxPt4S69u3hys6DgxC0a/z+2azw75lV1pWHZ8HDJ8jq8TSOltMUQKgoiq6FE9ibFvy5bTJOLFlthEUCxLdd7Wna0Nx6zRcvr8q5dISYkNoLgxmUmCKisMaOdXkTBXUnZhWi1DNk= lekva@gl.local
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCxH+RJysdTkLM9wBwmcVDy5SNx5cZqsIcMxGd0366j+9e79Mz2mxrptK+btPzrJl9+rZxLiQCSQbvFKtxZ2H1w8AOl1qiTkDmKswsHjZU4Y8ID842MOuNSztSeUWfBUgUc+F9rDtBg4fW9I8dZuQvBVgwm2xRasLJKt5netmlnPutbc2S3UefSOkDUS0gUEJhyR8HD8tOeJFzbDWN0CnzBkO4QKwkty2yUi4WixlE66f+mZJdFzfQZ/NBHBwviYE2QzJdchE7pA61rtEVgQG/q2zVPM9nvNgyplxFOYtsHWIsiHMlWFDd8AXaio4B/iSNMgoyUKNUKpmegqWE8+XhAjdonbXZEs49digbdT+BhZc5AePllFlQ4eEtyG3HINcTp864W2Af3XFXEMo3i0dsfFJwuE2xaanC09ST6piDajNnslZiYx20cPaWN04Lowy3ISjztlt5nUY4kpMmf+Tu5VWQMmzrvUv9ANSGrRFV/yGvi3GtzuA2UqIEFnp9xPhTkTT0slzB5Dmbrw1AWEZN+K1fn6emHFj+xpFfWuVubEBFqSlxozTuUQeUrsTolW8nLR13Fy7ajHD/zzItGd8Edc6oipIbLv0IQJ2OKPpr0J70e6cfuiuJXQDEnj5v4zPMMVIgygUks9bYZ0AgWIl5kOFcr67Rc/okJnxlCSvgnaw== pi@raspberrypi
-packages:
-  - emacs
-runcmd:
-  - apt autoremove -y --purge snapd
-  - echo "\nalias e='emacs -nw'\n" >> /home/pcloud/.bash_profile
diff --git a/scripts/homelab/user-data-rpi114 b/scripts/homelab/user-data-rpi114
deleted file mode 100644
index 07064fd..0000000
--- a/scripts/homelab/user-data-rpi114
+++ /dev/null
@@ -1,25 +0,0 @@
-#cloud-config
-hostname: rpi114
-manage_etc_hosts: true
-ssh_pwauth: false
-package_update: true
-package_upgrade: true
-growpart:
-  mode: false
-resize_rootfs: false
-users:
-  - name: pcloud
-    primary-group: users
-    groups: users, sudo
-    shell: /bin/bash
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    ssh-import-id: None
-    lock_passwd: true
-    ssh-authorized-keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDM3fYFTroCfHhT6GBUpD5vTvRPZSGi5rgBT8cvT75AKKPmuZRE+kUh4miwdw3jFT1VC5qrNqaE8Xrhppg+brVNt24lTgL9Pr5WW5mTa8Wbb3sWoCy93xv1B5TU7dUBQr/bB4FE1WeHIktkaBlEBssvOyf/IR0DR3N2rbaSWyS3zp+6+/Bk1powoXoOA7hvpwFmxYZggovATmoZoQAIqDO4W90MAR+U8c5E4jtJs3WHktlqwZff/csvrXHGCpIA2rtEbeHS6dOCx3uiBCsl/sTqaig9QmQZE260YtVTINRejFS0/mFXs9OpUEYa/yVH1x2k49Pp+sJjTgNOS5BiQLvuduL83vCehl5+IGonhJ6jZEu0L+g9YaPI2qsaIxPt4S69u3hys6DgxC0a/z+2azw75lV1pWHZ8HDJ8jq8TSOltMUQKgoiq6FE9ibFvy5bTJOLFlthEUCxLdd7Wna0Nx6zRcvr8q5dISYkNoLgxmUmCKisMaOdXkTBXUnZhWi1DNk= lekva@gl.local
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCxH+RJysdTkLM9wBwmcVDy5SNx5cZqsIcMxGd0366j+9e79Mz2mxrptK+btPzrJl9+rZxLiQCSQbvFKtxZ2H1w8AOl1qiTkDmKswsHjZU4Y8ID842MOuNSztSeUWfBUgUc+F9rDtBg4fW9I8dZuQvBVgwm2xRasLJKt5netmlnPutbc2S3UefSOkDUS0gUEJhyR8HD8tOeJFzbDWN0CnzBkO4QKwkty2yUi4WixlE66f+mZJdFzfQZ/NBHBwviYE2QzJdchE7pA61rtEVgQG/q2zVPM9nvNgyplxFOYtsHWIsiHMlWFDd8AXaio4B/iSNMgoyUKNUKpmegqWE8+XhAjdonbXZEs49digbdT+BhZc5AePllFlQ4eEtyG3HINcTp864W2Af3XFXEMo3i0dsfFJwuE2xaanC09ST6piDajNnslZiYx20cPaWN04Lowy3ISjztlt5nUY4kpMmf+Tu5VWQMmzrvUv9ANSGrRFV/yGvi3GtzuA2UqIEFnp9xPhTkTT0slzB5Dmbrw1AWEZN+K1fn6emHFj+xpFfWuVubEBFqSlxozTuUQeUrsTolW8nLR13Fy7ajHD/zzItGd8Edc6oipIbLv0IQJ2OKPpr0J70e6cfuiuJXQDEnj5v4zPMMVIgygUks9bYZ0AgWIl5kOFcr67Rc/okJnxlCSvgnaw== pi@raspberrypi
-packages:
-  - emacs
-runcmd:
-  - apt autoremove -y --purge snapd
-  - echo "\nalias e='emacs -nw'\n" >> /home/pcloud/.bash_profile
diff --git a/scripts/homelab/user-data-rpi115 b/scripts/homelab/user-data-rpi115
deleted file mode 100644
index 4e9c611..0000000
--- a/scripts/homelab/user-data-rpi115
+++ /dev/null
@@ -1,25 +0,0 @@
-#cloud-config
-hostname: rpi115
-manage_etc_hosts: true
-ssh_pwauth: false
-package_update: true
-package_upgrade: true
-growpart:
-  mode: false
-resize_rootfs: false
-users:
-  - name: pcloud
-    primary-group: users
-    groups: users, sudo
-    shell: /bin/bash
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    ssh-import-id: None
-    lock_passwd: true
-    ssh-authorized-keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDM3fYFTroCfHhT6GBUpD5vTvRPZSGi5rgBT8cvT75AKKPmuZRE+kUh4miwdw3jFT1VC5qrNqaE8Xrhppg+brVNt24lTgL9Pr5WW5mTa8Wbb3sWoCy93xv1B5TU7dUBQr/bB4FE1WeHIktkaBlEBssvOyf/IR0DR3N2rbaSWyS3zp+6+/Bk1powoXoOA7hvpwFmxYZggovATmoZoQAIqDO4W90MAR+U8c5E4jtJs3WHktlqwZff/csvrXHGCpIA2rtEbeHS6dOCx3uiBCsl/sTqaig9QmQZE260YtVTINRejFS0/mFXs9OpUEYa/yVH1x2k49Pp+sJjTgNOS5BiQLvuduL83vCehl5+IGonhJ6jZEu0L+g9YaPI2qsaIxPt4S69u3hys6DgxC0a/z+2azw75lV1pWHZ8HDJ8jq8TSOltMUQKgoiq6FE9ibFvy5bTJOLFlthEUCxLdd7Wna0Nx6zRcvr8q5dISYkNoLgxmUmCKisMaOdXkTBXUnZhWi1DNk= lekva@gl.local
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCxH+RJysdTkLM9wBwmcVDy5SNx5cZqsIcMxGd0366j+9e79Mz2mxrptK+btPzrJl9+rZxLiQCSQbvFKtxZ2H1w8AOl1qiTkDmKswsHjZU4Y8ID842MOuNSztSeUWfBUgUc+F9rDtBg4fW9I8dZuQvBVgwm2xRasLJKt5netmlnPutbc2S3UefSOkDUS0gUEJhyR8HD8tOeJFzbDWN0CnzBkO4QKwkty2yUi4WixlE66f+mZJdFzfQZ/NBHBwviYE2QzJdchE7pA61rtEVgQG/q2zVPM9nvNgyplxFOYtsHWIsiHMlWFDd8AXaio4B/iSNMgoyUKNUKpmegqWE8+XhAjdonbXZEs49digbdT+BhZc5AePllFlQ4eEtyG3HINcTp864W2Af3XFXEMo3i0dsfFJwuE2xaanC09ST6piDajNnslZiYx20cPaWN04Lowy3ISjztlt5nUY4kpMmf+Tu5VWQMmzrvUv9ANSGrRFV/yGvi3GtzuA2UqIEFnp9xPhTkTT0slzB5Dmbrw1AWEZN+K1fn6emHFj+xpFfWuVubEBFqSlxozTuUQeUrsTolW8nLR13Fy7ajHD/zzItGd8Edc6oipIbLv0IQJ2OKPpr0J70e6cfuiuJXQDEnj5v4zPMMVIgygUks9bYZ0AgWIl5kOFcr67Rc/okJnxlCSvgnaw== pi@raspberrypi
-packages:
-  - emacs
-runcmd:
-  - apt autoremove -y --purge snapd
-  - echo "\nalias e='emacs -nw'\n" >> /home/pcloud/.bash_profile
diff --git a/scripts/homelab/user-data-rpi116 b/scripts/homelab/user-data-rpi116
deleted file mode 100644
index 0295844..0000000
--- a/scripts/homelab/user-data-rpi116
+++ /dev/null
@@ -1,25 +0,0 @@
-#cloud-config
-hostname: rpi116
-manage_etc_hosts: true
-ssh_pwauth: false
-package_update: true
-package_upgrade: true
-growpart:
-  mode: false
-resize_rootfs: false
-users:
-  - name: pcloud
-    primary-group: users
-    groups: users, sudo
-    shell: /bin/bash
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    ssh-import-id: None
-    lock_passwd: true
-    ssh-authorized-keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDM3fYFTroCfHhT6GBUpD5vTvRPZSGi5rgBT8cvT75AKKPmuZRE+kUh4miwdw3jFT1VC5qrNqaE8Xrhppg+brVNt24lTgL9Pr5WW5mTa8Wbb3sWoCy93xv1B5TU7dUBQr/bB4FE1WeHIktkaBlEBssvOyf/IR0DR3N2rbaSWyS3zp+6+/Bk1powoXoOA7hvpwFmxYZggovATmoZoQAIqDO4W90MAR+U8c5E4jtJs3WHktlqwZff/csvrXHGCpIA2rtEbeHS6dOCx3uiBCsl/sTqaig9QmQZE260YtVTINRejFS0/mFXs9OpUEYa/yVH1x2k49Pp+sJjTgNOS5BiQLvuduL83vCehl5+IGonhJ6jZEu0L+g9YaPI2qsaIxPt4S69u3hys6DgxC0a/z+2azw75lV1pWHZ8HDJ8jq8TSOltMUQKgoiq6FE9ibFvy5bTJOLFlthEUCxLdd7Wna0Nx6zRcvr8q5dISYkNoLgxmUmCKisMaOdXkTBXUnZhWi1DNk= lekva@gl.local
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCxH+RJysdTkLM9wBwmcVDy5SNx5cZqsIcMxGd0366j+9e79Mz2mxrptK+btPzrJl9+rZxLiQCSQbvFKtxZ2H1w8AOl1qiTkDmKswsHjZU4Y8ID842MOuNSztSeUWfBUgUc+F9rDtBg4fW9I8dZuQvBVgwm2xRasLJKt5netmlnPutbc2S3UefSOkDUS0gUEJhyR8HD8tOeJFzbDWN0CnzBkO4QKwkty2yUi4WixlE66f+mZJdFzfQZ/NBHBwviYE2QzJdchE7pA61rtEVgQG/q2zVPM9nvNgyplxFOYtsHWIsiHMlWFDd8AXaio4B/iSNMgoyUKNUKpmegqWE8+XhAjdonbXZEs49digbdT+BhZc5AePllFlQ4eEtyG3HINcTp864W2Af3XFXEMo3i0dsfFJwuE2xaanC09ST6piDajNnslZiYx20cPaWN04Lowy3ISjztlt5nUY4kpMmf+Tu5VWQMmzrvUv9ANSGrRFV/yGvi3GtzuA2UqIEFnp9xPhTkTT0slzB5Dmbrw1AWEZN+K1fn6emHFj+xpFfWuVubEBFqSlxozTuUQeUrsTolW8nLR13Fy7ajHD/zzItGd8Edc6oipIbLv0IQJ2OKPpr0J70e6cfuiuJXQDEnj5v4zPMMVIgygUks9bYZ0AgWIl5kOFcr67Rc/okJnxlCSvgnaw== pi@raspberrypi
-packages:
-  - emacs
-runcmd:
-  - apt autoremove -y --purge snapd
-  - echo "\nalias e='emacs -nw'\n" >> /home/pcloud/.bash_profile