diff --git a/deploy/terraform/vms.tf b/deploy/terraform/vms.tf
index 2073f24..207f77c 100644
--- a/deploy/terraform/vms.tf
+++ b/deploy/terraform/vms.tf
@@ -12,13 +12,14 @@ resource "proxmox_virtual_environment_vm" "omnibus" {
   migrate    = true
 
   cpu {
-    cores   = 4
+    cores   = 8
     sockets = 1
     type    = "host"
   }
 
   memory {
-    dedicated = 53248
+    dedicated = 98304
+    floating  = 0
   }
 
   disk {
diff --git a/hosts/omnibus/configuration.nix b/hosts/omnibus/configuration.nix
index de8228d..ba38c1c 100644
--- a/hosts/omnibus/configuration.nix
+++ b/hosts/omnibus/configuration.nix
@@ -38,7 +38,7 @@
 
     extraModprobeConfig = ''
       options zfs zfs_arc_min=8589934592 # 8 GiB
-      options zfs zfs_arc_max=51539607552 # 48 GiB
+      options zfs zfs_arc_max=85899345920 # 80 GiB
     '';
   };
 
diff --git a/hosts/omnibus/disk-config.nix b/hosts/omnibus/disk-config.nix
index 2f96db5..2f88ca2 100644
--- a/hosts/omnibus/disk-config.nix
+++ b/hosts/omnibus/disk-config.nix
@@ -2,10 +2,10 @@ let
   disks = {
     scsi = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
 
-    nvme0 = "/dev/disk/by-id/nvme-eui.0025384a51403eec";
-    nvme1 = "/dev/disk/by-id/nvme-eui.0025384a51403ea5";
-    nvme2 = "/dev/disk/by-id/nvme-eui.0025384a51403e68";
-    nvme3 = "/dev/disk/by-id/nvme-eui.0025384a514037ac";
+    nvme0 = "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_1TB_S7LANJ0YA11905J";
+    nvme1 = "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_1TB_S7LANJ0YA10743W";
+    nvme2 = "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_1TB_S7LANJ0YA12037F";
+    nvme3 = "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_1TB_S7LANJ0YA11966V";
 
     hdd0 = "/dev/disk/by-id/ata-ST20000NM007D-3DJ103_ZVT5YRX1";
     hdd1 = "/dev/disk/by-id/ata-ST20000NM007D-3DJ103_ZVT5JMZQ";
@@ -190,7 +190,7 @@ in
         };
 
         postCreateHook = ''
-          zpool add -f files log mirror ${disks.nvme0} ${disks.nvme1}
+          zpool add -f files log mirror ${disks.nvme2} ${disks.nvme3}
         '';
 
         datasets = {
@@ -224,8 +224,8 @@ in
         };
 
         postCreateHook = ''
-          zpool add -f blockbuster log ${disks.nvme2}
-          zpool add -f blockbuster cache ${disks.nvme3}
+          zpool add -f blockbuster log ${disks.nvme0}
+          zpool add -f blockbuster cache ${disks.nvme1}
         '';
 
         datasets = {