diff --git a/deployer/bootiful-common b/deployer/bootiful-common
index 1e0bf9f1ca95deb122221b5c77618e995e94018b..6b63785901189bbec4dcadce6d26c8b2e767b276 100644
--- a/deployer/bootiful-common
+++ b/deployer/bootiful-common
@@ -640,7 +640,7 @@ create_hidden_partition() {
     refresh_partition_table
 
     echo "Creating file system in hidden partition..."
-    mke2fs -t ext2 "${deployment_disk}1" ||
+    mke2fs -t ext2 "${deployment_disk}p1" ||
         fatal_error "mke2fs exited with error code $?"
     echo "File system in hidden partition created."
 
diff --git a/deployer/bootiful-deploy b/deployer/bootiful-deploy
index 0fd303842ff88a093ba963eb9843b3ca0e7d7eac..06a8dfc2edcc1a7470e46835bd7b2aae14f73c8f 100755
--- a/deployer/bootiful-deploy
+++ b/deployer/bootiful-deploy
@@ -496,14 +496,14 @@ echo "Starting logging stdout and stderr to $log_file..."
     readonly remote_image_efi_entrypoint_file="$remote_image_dir/efi_entrypoint"
     readonly remote_image_efi_nvram_file="$remote_image_dir/efi-nvram.dat"
     readonly mounting_point_esp="/bootiful/esp"
-    readonly esp_partition="${deployment_disk}1"
+    readonly esp_partition="${deployment_disk}p1"
 
     mount_esp() {
         echo "Mounting ESP partition..."
         ensure_directory "$mounting_point_esp"
         refresh_partition_table
-        mount "$esp_partition" "$mounting_point_esp" ||
-            fatal_error "Cannot mount $esp_partition on $mounting_point_esp"
+        mount "$esp_partition" "$mounting_point_esp" #||
+            #fatal_error "Cannot mount $esp_partition on $mounting_point_esp"
         echo "ESP partition mounted."
     }
 
diff --git a/tftp/tftpboot/boot/deployer/initrd.img b/tftp/tftpboot/boot/deployer/initrd.img
index 21cd9e819fea1219cb3dfae705be5b2294f58c96..7e9d99e456e2378060370c9b40e0f83fa4980e20 100644
--- a/tftp/tftpboot/boot/deployer/initrd.img
+++ b/tftp/tftpboot/boot/deployer/initrd.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1d69dbe85d52a0511865f3ed05e94ebc5d1781a89e1b2443109c1b23151796b
-size 110171845
+oid sha256:73eb1d88a831578a827a66fa59f046cabe0030332b377b425bd18743af5a9288
+size 20545604
diff --git a/tftp/tftpboot/boot/deployer/vmlinuz b/tftp/tftpboot/boot/deployer/vmlinuz
index 93987ecaaa1e7565946abfb5277ff5da8f768601..1a4400f17fbc67a3a5248b5546defc500a578772 100644
--- a/tftp/tftpboot/boot/deployer/vmlinuz
+++ b/tftp/tftpboot/boot/deployer/vmlinuz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f7871bc11e08322cc796d2802eb8420e42c3aa379467456d83ea6f6e446fd74
-size 11701352
+oid sha256:7ed542a6c8093477221da3115e55d015329384761020ac4c41a11d06300a307d
+size 7053824
diff --git a/tftp/tftpboot/boot/grub/grub.cfg b/tftp/tftpboot/boot/grub/grub.cfg
index 444b053727cb3da3096343d561302564582f60bf..01e3bc980d02b32c034498725a8e4ed2d8879510 100755
--- a/tftp/tftpboot/boot/grub/grub.cfg
+++ b/tftp/tftpboot/boot/grub/grub.cfg
@@ -13,12 +13,15 @@ if [ $check1 == 101 ]; then
     menuentry "Local HDD" {
         set root=(hd0,1)
 
-        if [ -e /efi_entrypoint ]; then
-            echo "Reading EFI entry point from (hd0,1)/efi_entrypoint file..."
-            source /efi_entrypoint
+        if [ -e /efi ]; then
+#        if [ -e /efi_entrypoint ]; then
+            echo "Reading EFI entry point from (hd0,1)/efi file..."
+            source /efi
 
-            echo "Chainloading to $efi_entrypoint"
-            chainloader $efi_entrypoint
+            
+            echo "Chainloading to /efi"
+            # chainloader $efi_entripoint
+            chainloader /efi/debian/grubx64.efi
         else
             echo "Legacy chainloading to (hd0,1)+1..."
             chainloader +1