diff --git a/machines/ponyo/configuration.nix b/machines/ponyo/configuration.nix
index 573166e..5c5d3ab 100644
--- a/machines/ponyo/configuration.nix
+++ b/machines/ponyo/configuration.nix
@@ -5,16 +5,17 @@
     ./hardware-configuration.nix
   ];
 
-  # oouao6kfyrirxuuyn6d7nzebyyuyrdnoxunjec2pz25zxqmsptlfgqqd.onion
+  # un23pkwc3ij7pugl4uiwvdrjjw7xghxbkzppgn3siubqggchbosi6cyd.onion
 
   networking.hostName = "ponyo";
 
   firmware.x86_64.enable = true;
   efi.enable = true;
+  boot.loader.grub.efiInstallAsRemovable = true;
 
   luks = {
     enable = true;
-    device.path = "/dev/disk/by-uuid/4f5cd792-716a-4dbb-9a1d-dd7b37948acc";
+    device.path = "/dev/disk/by-uuid/84eaca59-6b03-47b1-9296-9d4736bcf0e0";
   };
 
   system.autoUpgrade.enable = true;
diff --git a/machines/ponyo/hardware-configuration.nix b/machines/ponyo/hardware-configuration.nix
index 52117a2..cc2cd1b 100644
--- a/machines/ponyo/hardware-configuration.nix
+++ b/machines/ponyo/hardware-configuration.nix
@@ -16,13 +16,13 @@
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/396E-1E13";
+    { device = "/dev/disk/by-uuid/4CB6-D9F3";
       fsType = "vfat";
     };
 
   swapDevices = [
     {
-      device = "/dev/sdb2";
+      device = "/dev/disk/by-partuuid/af3c7ed6-9cc6-8241-bc36-8e1aff5c1a34";
       randomEncryption.enable = true;
     }
   ];