diff --git a/Almalinux/almalinux-10.pkr.hcl b/Almalinux/almalinux-10.pkr.hcl
index b5390bd..6594351 100644
--- a/Almalinux/almalinux-10.pkr.hcl
+++ b/Almalinux/almalinux-10.pkr.hcl
@@ -55,7 +55,7 @@ source "proxmox-iso" "almalinux-10" {
 
   ssh_username             = "xadmin"
   ssh_password             = "packer"
-  ssh_timeout              = "20m"
+  ssh_timeout              = "60m"
 }
 
 build {
diff --git a/FreeBSD/freebsd-15.pkr.hcl b/FreeBSD/freebsd-15.pkr.hcl
index 3883ef1..b1cc346 100644
--- a/FreeBSD/freebsd-15.pkr.hcl
+++ b/FreeBSD/freebsd-15.pkr.hcl
@@ -14,7 +14,58 @@ source "proxmox-iso" "freebsd-15" {
   vm_id                    = "210"
   boot_wait                = "5s"
   boot_key_interval        = "200ms"
-  boot_command             = ["<enter>", "<wait10s>", "<enter><wait1s>", "<enter><wait1s>", "freebsd<enter><wait1s>", "<enter><wait1s>", "<enter><wait1s>", "<enter><wait1s>", "<enter><wait15s>", "<enter><wait3s>", "<enter><wait1s>", "<enter><wait1s>", " <wait1s><enter><wait1s>", "<left><enter><wait5s>", "<enter><wait120s>", "packer<tab>packer<enter><wait500s>", "<down><down><enter><wait1s>", "95<up><enter><wait1s>", "<enter><wait1s>", "<enter><wait1s>", "<enter><wait1s>", "<enter><wait1s>", "<down><down><down> <enter><wait1s>", "<down><down><down><down><down><down><down><down> <enter><wait1s>", "<enter><wait2s>", "<enter><wait1s>", "xadmin<enter>", "Remote admin user<enter>", "<enter>", "<enter>", "wheel<enter>", "<enter>", "<enter>", "<enter>", "<enter>", "<enter>", "<enter>", "<enter>", "<enter>", "packer<enter>", "packer<enter>", "<enter>", "<enter>", "<enter><wait1s>", "<enter><wait1s>", "<left><enter><wait1s>", "pkg install -y qemu-guest-agent sudo<enter><wait30s>", "echo 'xadmin ALL=(ALL:ALL) NOPASSWD:ALL' > /usr/local/etc/sudoers.d/xadmin<enter><wait1s>", "sysrc qemu_guest_agent_enable=YES<enter><wait1s>", "exit<enter><wait1s>", "<enter>"]
+  boot_command             = ["<enter>",
+    "<wait10s>", # wait for boot to finish
+    "<enter><wait1s>",
+    "<enter><wait1s>",
+    "freebsd<enter><wait1s>", # hostname
+    "<enter><wait1s>",
+    "<enter><wait1s>",
+    "<enter><wait1s>",
+    "<enter><wait15s>", # wait for network to come up
+    "<enter><wait3s>", # wait for disk detection
+    "<enter><wait1s>",
+    "<enter><wait1s>",
+    " <wait1s><enter><wait1s>", # select disk
+    "<left><enter><wait5s>", # confirm disk destroy
+    "<enter><wait120s>", # install base system
+    "packer<tab>packer<enter><wait500s>", # root password
+    "<down><down><enter><wait1s>",
+    "95<up><enter><wait1s>", # timezone selection
+    "<enter><wait1s>",
+    "<enter><wait1s>",
+    "<enter><wait1s>",
+    "<enter><wait1s>",
+    "<down><down><down> <enter><wait1s>",
+    "<down><down><down><down><down><down><down><down> <enter><wait1s>",
+    "<enter><wait2s>",
+    "<enter><wait1s>",
+    "xadmin<enter>", # break-glass username
+    "Remote admin user<enter>", # break-glass name
+    "<enter>",
+    "<enter>",
+    "wheel<enter>", # break-glass group (wheel
+    "<enter>",
+    "<enter>",
+    "<enter>",
+    "<enter>",
+    "<enter>",
+    "<enter>",
+    "<enter>", 
+    "<enter>",
+    "packer<enter>", # break-glass password
+    "packer<enter>", # break-glass password confirm
+    "<enter>",
+    "<enter>",
+    "<enter><wait1s>",
+    "<enter><wait1s>",
+    "<left><enter><wait1s>", # open post-install shell
+    "pkg install -y qemu-guest-agent sudo<enter><wait30s>", # install qemu-guest-agent package for Proxmox
+    "echo 'xadmin ALL=(ALL:ALL) NOPASSWD:ALL' > /usr/local/etc/sudoers.d/xadmin<enter><wait1s>", # allow xadmin to sudo
+    "sysrc qemu_guest_agent_enable=YES<enter><wait1s>", # enable QEMU guest agent
+    "exit<enter><wait1s>", # exit shell
+    "<enter>" # reboot
+  ]
 
   os                       = "other"
   cores                    = "2"
diff --git a/Rocky/rocky-10.pkr.hcl b/Rocky/rocky-10.pkr.hcl
index 610ab90..72594c8 100644
--- a/Rocky/rocky-10.pkr.hcl
+++ b/Rocky/rocky-10.pkr.hcl
@@ -55,7 +55,7 @@ source "proxmox-iso" "rocky-10" {
 
   ssh_username             = "xadmin"
   ssh_password             = "packer"
-  ssh_timeout              = "20m"
+  ssh_timeout              = "60m"
 }
 
 build {
diff --git a/http/rocky-server.ks b/http/rocky-server.ks
index 8849b70..aef91a6 100644
--- a/http/rocky-server.ks
+++ b/http/rocky-server.ks
@@ -1,7 +1,7 @@
 # Main installation source (BaseOS)
-url --mirrorlist="https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever"
+url --mirrorlist="https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever_major"
 # Additional AppStream repository
-repo --name="AppStream" --mirrorlist="https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever"
+repo --name="AppStream" --mirrorlist="https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever_major"
 
 # Keyboard layouts
 keyboard --vckeymap=us --xlayouts='us'