diff --git a/scripts/homelab/network-config-rpi111 b/scripts/homelab/network-config-rpi111
new file mode 100644
index 0000000..5fafdc6
--- /dev/null
+++ b/scripts/homelab/network-config-rpi111
@@ -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: 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
new file mode 100644
index 0000000..7625bcc
--- /dev/null
+++ b/scripts/homelab/network-config-rpi112
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000..fe2d6a9
--- /dev/null
+++ b/scripts/homelab/network-config-rpi113
@@ -0,0 +1,10 @@
+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/rpi111.sh b/scripts/homelab/rpi111.sh
index 7b9b59b..844cd74 100755
--- a/scripts/homelab/rpi111.sh
+++ b/scripts/homelab/rpi111.sh
@@ -6,11 +6,14 @@
 sudo parted $DRIVE_NAME mkpart primary 101GB 100%
 sudo mkfs.vfat -n system-boot -F 32 "${DRIVE_NAME}1"
 sudo mkfs.ext4 -L writable "${DRIVE_NAME}2"
-# sudo mkfs.ext4 -L pcloud-storage "${DRIVE_NAME}3"
-# add script to auto mount sda3 to /opt/pcloud-storage
+sudo mkfs.ext4 -L pcloud-storage "${DRIVE_NAME}3"
+# update /etc/fstab to include pcloud-storage
 
-sudo mkdir /mnt/{boot-img,rootfs-img,boot-drive,rootfs-drive}
-LOOP_DEVICE=$(sudo losetup -fP --show ubuntu-20.10-server-arm64-raspi.img)
+sudo mkdir /mnt/boot-img
+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)
 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
@@ -19,6 +22,7 @@
 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 umount /mnt/boot-img
 sudo umount /mnt/rootfs-img
 sudo umount /mnt/boot-drive
diff --git a/scripts/homelab/rpi112.sh b/scripts/homelab/rpi112.sh
index 4cb45bb..f443755 100755
--- a/scripts/homelab/rpi112.sh
+++ b/scripts/homelab/rpi112.sh
@@ -6,9 +6,13 @@
 sudo parted $DRIVE_NAME mkpart primary 101GB 100%
 sudo mkfs.vfat -n system-boot -F 32 "${DRIVE_NAME}1"
 sudo mkfs.ext4 -L writable "${DRIVE_NAME}2"
+sudo mkfs.ext4 -L pcloud-storage "${DRIVE_NAME}3"
 
-sudo mkdir /mnt/{boot-img,rootfs-img,boot-drive,rootfs-drive}
-LOOP_DEVICE=$(sudo losetup -fP --show ubuntu-20.10-server-arm64-raspi.img)
+sudo mkdir /mnt/boot-img
+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)
 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
@@ -17,6 +21,7 @@
 sudo rsync -axv /mnt/rootfs-img/ /mnt/rootfs-drive
 sudo touch /mnt/boot-drive/ssh
 sudo cp -f user-data-rpi112 /mnt/boot-drive/user-data
+sudo cp -f network-config-rpi112 /mnt/boot-drive/network-config
 sudo umount /mnt/boot-img
 sudo umount /mnt/rootfs-img
 sudo umount /mnt/boot-drive
diff --git a/scripts/homelab/rpi113.sh b/scripts/homelab/rpi113.sh
index 33a0ff2..b9bbeab 100755
--- a/scripts/homelab/rpi113.sh
+++ b/scripts/homelab/rpi113.sh
@@ -1,15 +1,18 @@
 DRIVE_NAME=$1
 
-# sudo parted $DRIVE_NAME mklabel gpt
-# sudo parted $DRIVE_NAME mkpart primary fat32 0% 1GB
-# sudo parted $DRIVE_NAME mkpart primary ext4 1GB 101GB
-# sudo parted $DRIVE_NAME mkpart primary 101GB 100%
-
+sudo parted $DRIVE_NAME mklabel gpt
+sudo parted $DRIVE_NAME mkpart primary fat32 0% 1GB
+sudo parted $DRIVE_NAME mkpart primary ext4 1GB 101GB
+sudo parted $DRIVE_NAME mkpart primary 101GB 100%
 sudo mkfs.vfat -n system-boot -F 32 "${DRIVE_NAME}1"
 sudo mkfs.ext4 -L writable "${DRIVE_NAME}2"
+sudo mkfs.ext4 -L pcloud-storage "${DRIVE_NAME}3"
 
-sudo mkdir /mnt/{boot-img,rootfs-img,boot-drive,rootfs-drive}
-LOOP_DEVICE=$(sudo losetup -fP --show ubuntu-20.10-server-arm64-raspi.img)
+sudo mkdir /mnt/boot-img
+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)
 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
@@ -18,8 +21,9 @@
 sudo rsync -axv /mnt/rootfs-img/ /mnt/rootfs-drive
 sudo touch /mnt/boot-drive/ssh
 sudo cp -f user-data-rpi113 /mnt/boot-drive/user-data
+sudo cp -f network-config-rpi113 /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
-sudo rm -rf /mnt/{boot-img,rootfs-img,boot-drive,rootfs-drive}
+
diff --git a/scripts/homelab/user-data-rpi111 b/scripts/homelab/user-data-rpi111
index 8c0d0f2..cbeddf4 100644
--- a/scripts/homelab/user-data-rpi111
+++ b/scripts/homelab/user-data-rpi111
@@ -17,6 +17,7 @@
     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:
diff --git a/scripts/homelab/user-data-rpi112 b/scripts/homelab/user-data-rpi112
index c965cd2..a207df7 100644
--- a/scripts/homelab/user-data-rpi112
+++ b/scripts/homelab/user-data-rpi112
@@ -17,6 +17,7 @@
     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:
diff --git a/scripts/homelab/user-data-rpi113 b/scripts/homelab/user-data-rpi113
index 92bb9df..2b3ea3b 100644
--- a/scripts/homelab/user-data-rpi113
+++ b/scripts/homelab/user-data-rpi113
@@ -17,6 +17,7 @@
     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: