diff --git a/nix/modules/nixos/infrastructure/hetzner-instance/default.nix b/nix/modules/nixos/infrastructure/hetzner-instance/default.nix
index 55d0d39..1671e2c 100644
--- a/nix/modules/nixos/infrastructure/hetzner-instance/default.nix
+++ b/nix/modules/nixos/infrastructure/hetzner-instance/default.nix
@@ -6,8 +6,36 @@
 }:
 let
   cfg = config.khscodes.infrastructure.hetzner-instance;
+  hasDisks = cfg.dataDisks != [ ];
   fqdn = config.khscodes.networking.fqdn;
   provisioningUserData = config.khscodes.infrastructure.provisioning.instanceUserData;
+  locationFromDatacenter =
+    datacenter:
+    let
+      split = lib.strings.splitString "-" datacenter;
+    in
+    assert (lib.lists.length split) == 2;
+    lib.lists.head split;
+
+  diskModule = lib.khscodes.mkSubmodule' (
+    { config }:
+    {
+      description = "Persistent disk";
+      options = {
+        name = lib.mkOption {
+          type = lib.types.str;
+        };
+        nameSanitized = lib.mkOption {
+          type = lib.types.str;
+          readOnly = true;
+          default = lib.khscodes.sanitize-terraform-name config.name;
+        };
+        size = lib.mkOption {
+          type = lib.types.int;
+        };
+      };
+    }
+  );
   firewallTcpRules = lib.lists.map (p: {
     direction = "in";
     protocol = "tcp";
@@ -139,6 +167,11 @@ in
       description = "The server type to create";
       default = null;
     };
+    dataDisks = lib.mkOption {
+      type = lib.types.listOf diskModule;
+      description = "Extra data disks to add to the instance, these will be added in the persistence phase";
+      default = [ ];
+    };
     extraFirewallRules = lib.mkOption {
       type = lib.types.listOf lib.types.attrs;
       description = "Extra firewall rules added to the instance";
@@ -190,7 +223,72 @@ in
       labels = {
         app = fqdn;
       };
-      modules = [
+      persistenceModules = lib.lists.optional hasDisks (
+        { ... }:
+        {
+          imports = [
+            inputs.self.terranixModules.hcloud
+            inputs.self.terranixModules.s3
+          ];
+          config = {
+            khscodes.s3 = {
+              enable = true;
+              bucket.key = "persistence-" + cfg.bucket.key;
+            };
+            khscodes.hcloud.enable = true;
+            resource.hcloud_volume = lib.listToAttrs (
+              lib.lists.map (disk: {
+                name = disk.nameSanitized;
+                value = {
+                  inherit (disk) name size;
+                  location = locationFromDatacenter cfg.datacenter;
+                };
+              }) cfg.dataDisks
+            );
+          };
+        }
+      );
+      persistenceAttachModules = lib.lists.optional hasDisks (
+        { config, ... }:
+        {
+          config = {
+            data.hcloud_volume = lib.listToAttrs (
+              lib.lists.map (disk: {
+                name = disk.nameSanitized;
+                value = {
+                  name = disk.name;
+                };
+              }) cfg.dataDisks
+            );
+            resource.hcloud_volume_attachment = lib.listToAttrs (
+              lib.lists.map (disk: {
+                name = disk.nameSanitized;
+                value = {
+                  volume_id = "\${ data.hcloud_volume.${disk.nameSanitized}.id }";
+                  server_id = config.khscodes.hcloud.output.server.compute.id;
+                };
+              }) cfg.dataDisks
+            );
+            resource.vault_kv_secret_v2.data_disks = {
+              mount = "data-disks";
+              name = fqdn;
+              data_json = ''
+                {
+                  "template": "{id}",
+                  "mapping": ''${ jsonencode({ ${
+                    lib.strings.concatStringsSep ", " (
+                      lib.lists.map (
+                        disk: "${builtins.toJSON disk.name} = data.hcloud_volume.${disk.nameSanitized}.linux_device"
+                      ) cfg.dataDisks
+                    )
+                  } }) }
+                }
+              '';
+            };
+          };
+        }
+      );
+      computeModules = [
         (
           { config, ... }:
           {
@@ -264,7 +362,7 @@ in
     {
       assertions = [
         {
-          assertion = config.khscodes.networking.fqdn != null;
+          assertion = fqdn != null;
           message = "Must set config.khscodes.networking.fqdn when using opentofu";
         }
       ];
@@ -278,8 +376,15 @@ in
         url = "http://169.254.169.254/latest/user-data";
         doubleDecodeJsonData = true;
       };
-      khscodes.infrastructure.provisioning.pre = {
-        modules = modules;
+      khscodes.infrastructure.vault-server-approle.policy = lib.mkIf hasDisks {
+        "data-disks/data/${fqdn}" = {
+          capabilities = [ "read" ];
+        };
+      };
+      khscodes.infrastructure.provisioning = {
+        compute.modules = computeModules;
+        persistence.modules = persistenceModules;
+        persistenceAttach.modules = persistenceAttachModules;
       };
     }
   );
diff --git a/nix/modules/nixos/infrastructure/khs-openstack-instance/default.nix b/nix/modules/nixos/infrastructure/khs-openstack-instance/default.nix
index 8a6433c..0588db6 100644
--- a/nix/modules/nixos/infrastructure/khs-openstack-instance/default.nix
+++ b/nix/modules/nixos/infrastructure/khs-openstack-instance/default.nix
@@ -206,10 +206,10 @@ in
       # so enable dns-01.
       khscodes.security.acme.dns01Enabled = true;
       khscodes.infrastructure.provisioning = {
-        pre = {
+        compute = {
           modules = modules;
         };
-        preImageUsername = "debian";
+        imageUsername = "debian";
       };
     }
   );
diff --git a/nix/modules/nixos/infrastructure/provisioning/default.nix b/nix/modules/nixos/infrastructure/provisioning/default.nix
index 3331cbd..962a639 100644
--- a/nix/modules/nixos/infrastructure/provisioning/default.nix
+++ b/nix/modules/nixos/infrastructure/provisioning/default.nix
@@ -1,10 +1,12 @@
 {
+  config,
   lib,
   inputs,
   pkgs,
   ...
 }:
 let
+  cfg = config.khscodes.infrastructure.provisioning;
   terranixConfig =
     cfg:
     if lib.lists.length cfg.modules > 0 then
@@ -85,11 +87,38 @@ let
 in
 {
   options.khscodes.infrastructure.provisioning = {
-    pre = lib.mkOption {
+    persistence = lib.mkOption {
+      description = ''
+        Allocation of resources that should be persisted between create/destroy of compute resources.
+        This would typically be cloud volumes, and perhaps floating IPs and other data/identity preserving information.
+      '';
       type = provisioning;
       default = { };
     };
-    post = lib.mkOption {
+    compute = lib.mkOption {
+      description = ''
+        Allocation of compute resources, DNS records and other ephemeral setup. This should NOT mount the volumes created from
+        persistence modules, that should be done in the `persistenceAttach` modules.
+      '';
+      type = provisioning;
+      default = { };
+    };
+    persistenceAttach = lib.mkOption {
+      description = ''
+        Mounting of volumes, or floating IPs from persistence modules to compute modules should go here. These will only ever be
+        executed merged with the compute resources. The compute resources will need to be able to be executed standalone however.
+      '';
+      type = provisioning;
+      default = { };
+    };
+    combinedPersistenceAttachAndCompute = lib.mkOption {
+      readOnly = true;
+      type = provisioning;
+      default = {
+        modules = cfg.compute.modules ++ cfg.persistenceAttach.modules;
+      };
+    };
+    configuration = lib.mkOption {
       type = provisioning;
       default = { };
     };
@@ -106,7 +135,7 @@ in
       description = "User data that should be added to the instance during provisioning";
       default = "";
     };
-    preImageUsername = lib.mkOption {
+    imageUsername = lib.mkOption {
       type = lib.types.str;
       description = "The username for the image being deployed before being swapped for NixOS";
       default = "root";
diff --git a/nix/modules/nixos/infrastructure/vault-server-approle/default.nix b/nix/modules/nixos/infrastructure/vault-server-approle/default.nix
index a2ec5f3..f1cfad8 100644
--- a/nix/modules/nixos/infrastructure/vault-server-approle/default.nix
+++ b/nix/modules/nixos/infrastructure/vault-server-approle/default.nix
@@ -13,11 +13,11 @@ in
     enable = lib.mkEnableOption "Enables creating an OpenBAO role for the server";
     stage = lib.mkOption {
       type = lib.types.enum [
-        "pre"
-        "post"
+        "compute"
+        "configuration"
       ];
-      description = "The provisioning stage that should include the provisioning. This should be pre for every server except the OpenBAO server itself";
-      default = "pre";
+      description = "The provisioning stage that should include the provisioning. This should be compute for every server except the OpenBAO server itself";
+      default = "compute";
     };
     path = lib.mkOption {
       type = lib.types.str;
@@ -60,7 +60,7 @@ in
   imports = [ ./unix-user.nix ];
 
   config = lib.mkIf cfg.enable {
-    khscodes.services.read-vault-auth-from-userdata.enable = cfg.stage == "pre";
+    khscodes.services.read-vault-auth-from-userdata.enable = cfg.stage == "compute";
     khscodes.services.vault-agent.enable = true;
     khscodes.infrastructure.provisioning.${cfg.stage} = {
       modules = [
@@ -129,11 +129,12 @@ in
             };
           }
         )
-      ] ++ cfg.stageModules;
+      ]
+      ++ cfg.stageModules;
     };
     # I can only provide the user data if the stage is pre (along with the instance creation)
     # Also I should probably find a way of injecting this in a nicer way than this mess.
-    khscodes.infrastructure.provisioning.instanceUserData = lib.mkIf (cfg.stage == "pre") {
+    khscodes.infrastructure.provisioning.instanceUserData = lib.mkIf (cfg.stage == "compute") {
       VAULT_ROLE_ID = "\${ vault_approle_auth_backend_role.${lib.khscodes.sanitize-terraform-name cfg.role_name}.role_id }";
       VAULT_SECRET_ID_WRAPPED = "\${ vault_approle_auth_backend_role_secret_id.${lib.khscodes.sanitize-terraform-name cfg.role_name}.wrapping_token }";
     };
diff --git a/nix/packages/configure-fleet/default.nix b/nix/packages/configure-fleet/default.nix
index a2b8d2b..f30ccc0 100644
--- a/nix/packages/configure-fleet/default.nix
+++ b/nix/packages/configure-fleet/default.nix
@@ -14,7 +14,7 @@ let
           nixos.config.khscodes.infrastructure.hetzner-instance.enable
           || nixos.config.khscodes.infrastructure.khs-openstack-instance.enable
         )
-        && ((lib.lists.length nixos.config.khscodes.infrastructure.provisioning.post.modules) > 0)
+        && ((lib.lists.length nixos.config.khscodes.infrastructure.provisioning.configuration.modules) > 0)
       then
         [ ">&2 echo \"Configuring ${name}\n\"\nconfigure-instance ${lib.escapeShellArg name}" ]
       else
diff --git a/nix/packages/configure-instance/default.nix b/nix/packages/configure-instance/default.nix
index 2baf72e..5205d83 100644
--- a/nix/packages/configure-instance/default.nix
+++ b/nix/packages/configure-instance/default.nix
@@ -1,10 +1,10 @@
 { pkgs, ... }:
 pkgs.writeShellApplication {
   name = "configure-instance";
-  runtimeInputs = [ pkgs.khscodes.post-provisioning ];
+  runtimeInputs = [ pkgs.khscodes.provision ];
   text = ''
     instance="''${1:-}"
     cmd="''${2:-apply}"
-    post-provisioning "$instance" "$cmd"
+    provision "$instance" configuration "$cmd"
   '';
 }
diff --git a/nix/packages/create-instance/default.nix b/nix/packages/create-instance/default.nix
index 6474d9d..c94be95 100644
--- a/nix/packages/create-instance/default.nix
+++ b/nix/packages/create-instance/default.nix
@@ -2,7 +2,7 @@
 pkgs.writeShellApplication {
   name = "create-instance";
   runtimeInputs = [
-    pkgs.khscodes.provision-instance
+    pkgs.khscodes.provision
     pkgs.khscodes.nixos-install
     pkgs.jq
   ];
@@ -10,8 +10,18 @@ pkgs.writeShellApplication {
     hostname="$1"
     # Build the configuration to ensure it doesn't fail when trying to install it on the host
     nix build --no-link '${inputs.self}#nixosConfigurations."'"$hostname"'".config.system.build.toplevel'
-    output="$(provision-instance "$hostname")"
+    # First ensure the persistence exists
+    provision "$hostname" persistence apply
+
+    # Then bring up the base instance *without* the persistence disks attached
+    output="$(provision "$hostname" compute apply)"
     ipv4_addr="$(echo "$output" | jq --raw-output '.ipv4_address.value')"
     nixos-install "$hostname" "$ipv4_addr" "no"
+
+    # After nixos-anywhere has messed with the ephemeral disks, then mount the remaining disks
+    provision "$hostname" combinedPersistenceAttachAndCompute apply
+
+    # Finally reboot the instance, to ensure everything boots up properly
+    ssh -t -o StrictHostKeyChecking=false -o UserKnownHostsFile=/dev/null "$ipv4_addr" -- sudo reboot
   '';
 }
diff --git a/nix/packages/destroy-instance/default.nix b/nix/packages/destroy-instance/default.nix
index cdba6bd..e6174ca 100644
--- a/nix/packages/destroy-instance/default.nix
+++ b/nix/packages/destroy-instance/default.nix
@@ -1,9 +1,15 @@
 { pkgs, ... }:
 pkgs.writeShellApplication {
   name = "destroy-instance";
-  runtimeInputs = [ pkgs.khscodes.pre-provisioning ];
+  runtimeInputs = [
+    pkgs.khscodes.provision
+  ];
   text = ''
     instance="''${1:-}"
-    pre-provisioning "$instance" destroy
+    with_persistence="''${2:-none}"
+    provision "$instance" combinedPersistenceAttachAndCompute destroy
+    if [[ "$with_persistence" == "all" ]]; then
+      provision "$instance" persistence destroy
+    fi
   '';
 }
diff --git a/nix/packages/instance-opentofu/default.nix b/nix/packages/instance-opentofu/default.nix
index 65e5130..67103fe 100644
--- a/nix/packages/instance-opentofu/default.nix
+++ b/nix/packages/instance-opentofu/default.nix
@@ -18,7 +18,7 @@ pkgs.writeShellApplication {
     fqdn="$1"
     config="$2"
     cmd="''${3:-apply}"
-    dir="$(mktemp -dt "$fqdn-pre-provisioning.XXXXXX")"
+    dir="$(mktemp -dt "$fqdn-compute-provision.XXXXXX")"
     mkdir -p "$dir"
     cat "''${config}" > "$dir/config.tf.json"
 
diff --git a/nix/packages/nixos-install/default.nix b/nix/packages/nixos-install/default.nix
index 24ed100..cc74cf1 100644
--- a/nix/packages/nixos-install/default.nix
+++ b/nix/packages/nixos-install/default.nix
@@ -19,9 +19,9 @@ pkgs.writeShellApplication {
       nix build --no-link '${inputs.self}#nixosConfigurations."'"$hostname"'".config.system.build.toplevel'
     fi
     baseAttr='${inputs.self}#nixosConfigurations."'"$hostname"'".config.khscodes.infrastructure'
-    config="$(nix build --no-link --print-out-paths "''${baseAttr}.provisioning.pre.config")"
+    config="$(nix build --no-link --print-out-paths "''${baseAttr}.provisioning.compute.config")"
     preScript="$(nix eval --raw "''${baseAttr}.nixos-install.preScript")"
-    username="$(nix eval --raw "''${baseAttr}.provisioning.preImageUsername")"
+    username="$(nix eval --raw "''${baseAttr}.provisioning.imageUsername")"
     if [[ "$config" == "null" ]]; then
       echo "No preprovisioning needed"
       exit 0
diff --git a/nix/packages/post-provisioning/default.nix b/nix/packages/post-provisioning/default.nix
deleted file mode 100644
index 67285a2..0000000
--- a/nix/packages/post-provisioning/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  inputs,
-  pkgs,
-}:
-pkgs.writeShellApplication {
-  name = "post-provisioning";
-  runtimeInputs = [
-    pkgs.nix
-    pkgs.khscodes.bw-opentofu
-    pkgs.khscodes.instance-opentofu
-    pkgs.khscodes.openbao-helper
-  ];
-  # TODO: Use secret source and required secrets to set up the correct env variables
-  text = ''
-    hostname="$1"
-    cmd="''${2:-apply}"
-    baseAttr='${inputs.self}#nixosConfigurations."'"$hostname"'".config.khscodes.infrastructure.provisioning'
-    config="$(nix build --no-link --print-out-paths "''${baseAttr}.post.config")"
-    secretsSource="$(nix eval --raw "''${baseAttr}.secretsSource")"
-    endpoints="$(nix eval --show-trace --json "''${baseAttr}.post.endpoints")"
-    if [[ "$config" == "null" ]]; then
-      echo "No postprovisioning needed"
-      exit 0
-    fi
-    if [[ "$secretsSource" == "vault" ]]; then
-      readarray -t endpoints_args < <(echo "$endpoints" | jq -cr 'map(["-e", .])[][]')
-      openbao-helper wrap-program "''${endpoints_args[@]}" -- instance-opentofu "$hostname" "$config" "$cmd"
-      exit 0
-    fi
-    bw-opentofu "$hostname" "$config" "$cmd"
-  '';
-}
diff --git a/nix/packages/provision-instance/default.nix b/nix/packages/provision-instance/default.nix
index 0acf0d5..c53f53e 100644
--- a/nix/packages/provision-instance/default.nix
+++ b/nix/packages/provision-instance/default.nix
@@ -1,9 +1,9 @@
 { pkgs, ... }:
 pkgs.writeShellApplication {
   name = "provision-instance";
-  runtimeInputs = [ pkgs.khscodes.pre-provisioning ];
+  runtimeInputs = [ pkgs.khscodes.provision ];
   text = ''
     instance="''${1:-}"
-    pre-provisioning "$instance" apply
+    provision "$instance" combinedPersistenceAttachAndCompute apply
   '';
 }
diff --git a/nix/packages/pre-provisioning/default.nix b/nix/packages/provision/default.nix
similarity index 68%
rename from nix/packages/pre-provisioning/default.nix
rename to nix/packages/provision/default.nix
index 076de3c..e6e139a 100644
--- a/nix/packages/pre-provisioning/default.nix
+++ b/nix/packages/provision/default.nix
@@ -3,7 +3,7 @@
   pkgs,
 }:
 pkgs.writeShellApplication {
-  name = "pre-provisioning";
+  name = "provision";
   runtimeInputs = [
     pkgs.nix
     pkgs.khscodes.bw-opentofu
@@ -14,13 +14,18 @@ pkgs.writeShellApplication {
   # TODO: Use secret source and required secrets to set up the correct env variables
   text = ''
     hostname="$1"
-    cmd="''${2:-apply}"
+    stage="$2"
+    cmd="''${3:-apply}"
     baseAttr='${inputs.self}#nixosConfigurations."'"$hostname"'".config.khscodes.infrastructure.provisioning'
-    config="$(nix build --no-link --print-out-paths "''${baseAttr}.pre.config")"
+    if [[ "$(nix eval "''${baseAttr}.''${stage}.config")" != "null" ]]; then
+      config="$(nix build --no-link --print-out-paths "''${baseAttr}.''${stage}.config")"
+    else
+      config="null"
+    fi
     secretsSource="$(nix eval --raw "''${baseAttr}.secretsSource")"
-    endpoints="$(nix eval --show-trace --json "''${baseAttr}.pre.endpoints")"
+    endpoints="$(nix eval --show-trace --json "''${baseAttr}.''${stage}.endpoints")"
     if [[ "$config" == "null" ]]; then
-      echo "No preprovisioning needed"
+      echo "No ''${stage} provisioning needed"
       exit 0
     fi
     if [[ "$secretsSource" == "vault" ]]; then
diff --git a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/default.nix b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/default.nix
index a522a99..e31efc6 100644
--- a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/default.nix
+++ b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/default.nix
@@ -1,17 +1,8 @@
 {
-  lib,
   inputs,
   ...
 }:
 let
-  locationFromDatacenter =
-    datacenter:
-    let
-      split = lib.strings.splitString "-" datacenter;
-    in
-    assert (lib.lists.length split) == 2;
-    lib.lists.head split;
-
   domains = [
     "agerlin-skovgaard.dk"
     "agerlinskovgaard.dk"
@@ -31,24 +22,15 @@ in
       hetzner-instance = {
         enable = true;
         mapRdns = true;
+        dataDisks = [
+          {
+            name = "mx.kaareskovgaard.net-zroot-disk1";
+            size = 10;
+          }
+        ];
         server_type = "cax11";
       };
-      provisioning.pre.modules = [
-        (
-          { config, ... }:
-          {
-            resource.hcloud_volume.zroot-disk1 = {
-              name = "mx.kaareskovgaard.net-zroot-disk1";
-              size = 30;
-              location = locationFromDatacenter config.khscodes.hcloud.server.compute.datacenter;
-            };
-            resource.hcloud_volume_attachment.zroot-disk1 = {
-              volume_id = "\${ resource.hcloud_volume.zroot-disk1.id }";
-              server_id = config.khscodes.hcloud.output.server.compute.id;
-              automount = false;
-            };
-          }
-        )
+      provisioning.compute.modules = [
         (
           { ... }:
           {
diff --git a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/disko.nix b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/disko.nix
index 79c6b23..a0f067d 100644
--- a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/disko.nix
+++ b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/disko.nix
@@ -5,16 +5,6 @@
   ...
 }:
 let
-  diskName = "nixos";
-  espSize = "500M";
-  bootPartName = "ESP";
-  rootPartName = "primary";
-  volumeGroupName = "mainpool";
-  rootLvName = "root";
-  # Don't ask me why this changes when there's more than one volume attached.
-  nixosDisk = "/dev/sdb";
-  zrootDisk1Disk = "/dev/sda";
-
   downloadZrootKey = pkgs.writeShellApplication {
     name = "zfs-download-zroot-key";
     runtimeInputs = [
@@ -87,17 +77,6 @@ in
       ];
     };
   };
-  khscodes.infrastructure.nixos-install.preScript = ''
-    encryption_key="$(bao kv get -mount=opentofu -field=MX_KAARESKOVGAARD_NET_ZROOT_ENCRYPTION_KEY mx.kaareskovgaard.net)"
-    tmpfile="$(mktemp)"
-    touch "$tmpfile"
-    chmod 0600 "$tmpfile"
-    trap "rm -f $tmpfile" EXIT
-    echo "$encryption_key" > "$tmpfile"
-    INSTALL_ARGS+=("--disk-encryption-keys")
-    INSTALL_ARGS+=("/run/secret/zroot.key")
-    INSTALL_ARGS+=("$tmpfile")
-  '';
   boot.supportedFilesystems = {
     zfs = true;
   };
@@ -157,110 +136,4 @@ in
     };
   };
   networking.hostId = "9af535e4";
-  disko.devices = {
-    disk = {
-      "${diskName}" = {
-        device = nixosDisk;
-        type = "disk";
-        content = {
-          type = "gpt";
-          partitions = {
-            "${bootPartName}" = {
-              size = espSize;
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            "${rootPartName}" = {
-              size = "100%";
-              content = {
-                type = "lvm_pv";
-                vg = volumeGroupName;
-              };
-            };
-          };
-        };
-      };
-      zroot-disk1 = {
-        device = zrootDisk1Disk;
-        type = "disk";
-        content = {
-          type = "gpt";
-          partitions = {
-            zfs = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-          };
-        };
-      };
-    };
-    lvm_vg = {
-      "${volumeGroupName}" = {
-        type = "lvm_vg";
-        lvs = {
-          "${rootLvName}" = {
-            size = "100%";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/";
-              mountOptions = [ "defaults" ];
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        rootFsOptions = {
-          mountpoint = "none";
-          compression = "zstd";
-          acltype = "posixacl";
-          xattr = "sa";
-          "com.sun:auto-snapshot" = "true";
-        };
-        options = {
-          ashift = "12";
-          autoexpand = "on";
-        };
-        datasets = {
-          "mailserver" = {
-            type = "zfs_fs";
-            options = {
-              encryption = "aes-256-gcm";
-              keyformat = "passphrase";
-              keylocation = "file:///run/secret/zroot.key";
-            };
-          };
-          "mailserver/vmail" = {
-            type = "zfs_fs";
-            mountpoint = "/var/mailserver/vmail";
-          };
-          "mailserver/indices" = {
-            type = "zfs_fs";
-            mountpoint = "/var/mailserver/indices";
-          };
-        };
-        mode = {
-          topology = {
-            type = "topology";
-            vdev = [
-              {
-                members = [ "zroot-disk1" ];
-              }
-            ];
-          };
-        };
-      };
-    };
-  };
 }
diff --git a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/accounts.nix b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/accounts.nix
index 9e7179a..22515e8 100644
--- a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/accounts.nix
+++ b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/accounts.nix
@@ -191,7 +191,7 @@ in
         capabilities = [ "read" ];
       };
     };
-    khscodes.infrastructure.provisioning.pre.modules = [
+    khscodes.infrastructure.provisioning.compute.modules = [
       {
         terraform.required_providers.random = {
           source = "hashicorp/random";
diff --git a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/default.nix b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/default.nix
index a514865..0f07544 100644
--- a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/default.nix
+++ b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/default.nix
@@ -50,7 +50,7 @@ in
         description = "smtp";
       }
     ];
-    khscodes.infrastructure.provisioning.pre.modules = [
+    khscodes.infrastructure.provisioning.compute.modules = [
       (
         { ... }:
         {
diff --git a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/dkim.nix b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/dkim.nix
index 4ed1876..1ad3d4c 100644
--- a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/dkim.nix
+++ b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/dkim.nix
@@ -57,7 +57,7 @@ in
         capabilities = [ "read" ];
       };
     };
-    khscodes.infrastructure.provisioning.pre.modules = [
+    khscodes.infrastructure.provisioning.compute.modules = [
       (
         { ... }:
         {
diff --git a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/dmarc.nix b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/dmarc.nix
index 998b8e6..9593e64 100644
--- a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/dmarc.nix
+++ b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/dmarc.nix
@@ -4,7 +4,7 @@ let
 in
 {
   config = {
-    khscodes.infrastructure.provisioning.pre.modules = [
+    khscodes.infrastructure.provisioning.compute.modules = [
       {
         khscodes.cloudflare.dns.txtRecords = lib.lists.map (domain: {
           fqdn = "_dmarc.${domain}";
diff --git a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/mta-sts.nix b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/mta-sts.nix
index 58ea779..9fca34a 100644
--- a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/mta-sts.nix
+++ b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/mta-sts.nix
@@ -36,7 +36,7 @@ in
         }) cfg.domains
       )
     );
-    khscodes.infrastructure.provisioning.pre.modules = [
+    khscodes.infrastructure.provisioning.compute.modules = [
       {
         khscodes.cloudflare.dns.txtRecords = (
           lib.lists.map (domain: {
diff --git a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/spf.nix b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/spf.nix
index 4b4b5c8..546741c 100644
--- a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/spf.nix
+++ b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/spf.nix
@@ -4,7 +4,7 @@ let
 in
 {
   config = {
-    khscodes.infrastructure.provisioning.pre.modules = [
+    khscodes.infrastructure.provisioning.compute.modules = [
       {
         khscodes.cloudflare.dns.txtRecords = lib.lists.map (domain: {
           fqdn = domain;
diff --git a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/tls-rpt.nix b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/tls-rpt.nix
index 1ffb0a4..9f9d0f3 100644
--- a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/tls-rpt.nix
+++ b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/tls-rpt.nix
@@ -4,7 +4,7 @@ let
 in
 {
   config = {
-    khscodes.infrastructure.provisioning.pre.modules = [
+    khscodes.infrastructure.provisioning.compute.modules = [
       {
         khscodes.cloudflare.dns.txtRecords = lib.lists.map (domain: {
           fqdn = "_smtp._tls.${domain}";
diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/default.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/default.nix
index 0e5b7a8..bc8353e 100644
--- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/default.nix
+++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/default.nix
@@ -28,7 +28,7 @@ in
     };
     # Cannot use vault for secrets source, as this is the server containing vault.
     khscodes.infrastructure.provisioning.secretsSource = "bitwarden";
-    khscodes.infrastructure.vault-server-approle.stage = "post";
+    khscodes.infrastructure.vault-server-approle.stage = "configuration";
     khscodes.networking.fqdn = "security.kaareskovgaard.net";
     khscodes.infrastructure.openbao.domain = "secrets.kaareskovgaard.net";
     system.stateVersion = "25.05";
diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/kanidm.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/kanidm.nix
index 9298a8d..a58f698 100644
--- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/kanidm.nix
+++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/kanidm.nix
@@ -186,7 +186,7 @@ in
       };
     };
 
-    khscodes.infrastructure.provisioning.post.modules = [
+    khscodes.infrastructure.provisioning.configuration.modules = [
       (
         { ... }:
         {
diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/kanidm_application.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/kanidm_application.nix
index 208e1f9..aea2450 100644
--- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/kanidm_application.nix
+++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/kanidm_application.nix
@@ -104,7 +104,7 @@ in
       };
     };
     khscodes.services.vault-agent.templates = vaultAgentTemplates;
-    khscodes.infrastructure.provisioning.post.modules = terranixModules ++ [
+    khscodes.infrastructure.provisioning.configuration.modules = terranixModules ++ [
       {
         terraform.required_providers.random = {
           source = "hashicorp/random";
diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/default.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/default.nix
index 40470d0..c14aa17 100644
--- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/default.nix
+++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/default.nix
@@ -1,7 +1,7 @@
 { inputs, ... }:
 {
   imports = [ ./openbao ];
-  khscodes.infrastructure.provisioning.post.modules = [
+  khscodes.infrastructure.provisioning.configuration.modules = [
     {
       imports = [
         inputs.self.terranixModules.s3
diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/approle.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/approle.nix
index 5d2a867..128af56 100644
--- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/approle.nix
+++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/approle.nix
@@ -1,6 +1,6 @@
 {
   khscodes.infrastructure.vault-server-approle.path = "\${ vault_auth_backend.approle.path }";
-  khscodes.infrastructure.provisioning.post.modules = [
+  khscodes.infrastructure.provisioning.configuration.modules = [
     {
       resource.vault_auth_backend.approle = {
         type = "approle";
diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/data-disks.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/data-disks.nix
new file mode 100644
index 0000000..014f09f
--- /dev/null
+++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/data-disks.nix
@@ -0,0 +1,14 @@
+{
+  khscodes.infrastructure.provisioning.configuration.modules = [
+    {
+      khscodes.vault.mount.data-disks = {
+        type = "kv";
+        path = "data-disks";
+        options = {
+          version = "2";
+        };
+        description = "Mapping between data disk names and IDs";
+      };
+    }
+  ];
+}
diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/default.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/default.nix
index 5bbb726..95cc930 100644
--- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/default.nix
+++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/default.nix
@@ -1,13 +1,14 @@
 {
   imports = [
     ./approle.nix
+    ./data-disks.nix
     ./ssh-host.nix
     ./loki-mtls.nix
     ./prometheus-mtls.nix
     ./unix-users.nix
   ];
   khscodes.infrastructure.vault-server-approle.path = "\${ vault_auth_backend.approle.path }";
-  khscodes.infrastructure.provisioning.post.modules = [
+  khscodes.infrastructure.provisioning.configuration.modules = [
     (
       { config, ... }:
       {
diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/loki-mtls.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/loki-mtls.nix
index 31e2ebd..371d5ba 100644
--- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/loki-mtls.nix
+++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/loki-mtls.nix
@@ -3,7 +3,7 @@
   khscodes.infrastructure.vault-loki-sender = {
     terranixBackendName = "\${ vault_mount.loki-mtls.path }";
   };
-  khscodes.infrastructure.provisioning.post.modules = [
+  khscodes.infrastructure.provisioning.configuration.modules = [
     (
       { config, ... }:
       {
diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/prometheus-mtls.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/prometheus-mtls.nix
index ed4d52b..5950351 100644
--- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/prometheus-mtls.nix
+++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/prometheus-mtls.nix
@@ -4,7 +4,7 @@
     # This is quite ugly, but should get the job done. Sadly I cannot reference the output from here.
     terranixBackendName = "\${ vault_mount.prometheus-mtls.path }";
   };
-  khscodes.infrastructure.provisioning.post.modules = [
+  khscodes.infrastructure.provisioning.configuration.modules = [
     (
       { config, ... }:
       {
diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/ssh-host.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/ssh-host.nix
index d43f969..2e0cb68 100644
--- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/ssh-host.nix
+++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/ssh-host.nix
@@ -1,6 +1,6 @@
 {
   khscodes.services.openssh.hostCertificate.path = "\${ vault_mount.ssh-host.path }";
-  khscodes.infrastructure.provisioning.post.modules = [
+  khscodes.infrastructure.provisioning.configuration.modules = [
     (
       { config, ... }:
       {
diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/unix-users.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/unix-users.nix
index ce8fc54..f55adba 100644
--- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/unix-users.nix
+++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/post/openbao/unix-users.nix
@@ -1,5 +1,5 @@
 {
-  khscodes.infrastructure.provisioning.post.modules = [
+  khscodes.infrastructure.provisioning.configuration.modules = [
     {
       khscodes.vault.mount.unix-users = {
         type = "kv";