diff --git a/tasks/crypt_profile.yml b/tasks/crypt_profile.yml
index 3beffc2..e02c275 100644
--- a/tasks/crypt_profile.yml
+++ b/tasks/crypt_profile.yml
@@ -8,5 +8,5 @@
 - name: set crypt profile vars
   set_fact:
     dmcrypt_devices: "{{_partitioning_crypt_profile.dmcrypt_devices}}"
-    system_device: "{{_partitioning_crypt_profile.system_device}}"
+    data_device: "{{_partitioning_crypt_profile.data_device}}"
     debian_boot_packages: "{{ debian_boot_packages | union(_partitioning_crypt_profile.debian_boot_packages) }}"
diff --git a/tasks/raid_profile.yml b/tasks/raid_profile.yml
index 519bddc..a334eae 100644
--- a/tasks/raid_profile.yml
+++ b/tasks/raid_profile.yml
@@ -15,5 +15,5 @@
     mdraid_devices: "{{_partitioning_raid_profile.mdraid_devices}}"
     boot_device: "{{_partitioning_raid_profile.boot_device}}"
     rescue_device: "{{_partitioning_raid_profile.rescue_device}}"
-    system_device: "{{_partitioning_raid_profile.system_device}}"
+    data_device: "{{_partitioning_raid_profile.data_device}}"
     debian_boot_packages: "{{ debian_boot_packages | union(_partitioning_raid_profile.debian_boot_packages) }}"
diff --git a/vars/base_profiles/bios-gpt.yml b/vars/base_profiles/bios-gpt.yml
index 48a5ead..6bfa09d 100644
--- a/vars/base_profiles/bios-gpt.yml
+++ b/vars/base_profiles/bios-gpt.yml
@@ -19,11 +19,11 @@ partitions:
     typecode: 8300
     usage: rescue
   - prefix: "{{inventory_hostname_short}}-"
-    suffix: -system
+    suffix: -data
     start: 2GiB
     end: "{{last_partition_end}}"
     typecode: 8300
-    usage: system
+    usage: data
 
 debian_boot_packages:
   - grub-pc
diff --git a/vars/base_profiles/bios-mbr.yml b/vars/base_profiles/bios-mbr.yml
index 53a636e..beccfbb 100644
--- a/vars/base_profiles/bios-mbr.yml
+++ b/vars/base_profiles/bios-mbr.yml
@@ -12,7 +12,7 @@ partitions:
   - type: primary
     start: 2GiB
     end: "{{last_partition_end}}"
-    usage: system
+    usage: data
 
 debian_boot_packages:
   - grub-pc
diff --git a/vars/base_profiles/efi.yml b/vars/base_profiles/efi.yml
index 19ee553..6348277 100644
--- a/vars/base_profiles/efi.yml
+++ b/vars/base_profiles/efi.yml
@@ -22,11 +22,11 @@ partitions:
     typecode: 8300
     usage: rescue
   - prefix: "{{inventory_hostname_short}}-"
-    suffix: -system
+    suffix: -data
     start: 2GiB
     end: "{{last_partition_end}}"
     typecode: 8300
-    usage: system
+    usage: data
 
 debian_boot_packages:
   - efibootmgr
diff --git a/vars/crypt_profiles/dmcrypt-luks.yml b/vars/crypt_profiles/dmcrypt-luks.yml
index 56c8b0a..cadd1bb 100644
--- a/vars/crypt_profiles/dmcrypt-luks.yml
+++ b/vars/crypt_profiles/dmcrypt-luks.yml
@@ -1,11 +1,11 @@
 dmcrypt_devices:
-  - device: "{{ system_device }}"
-    name: "{{inventory_hostname}}-crypt0"
+  - device: "{{ data_device }}"
+    name: "{{inventory_hostname_short}}-crypt0"
     cipher: aes-xts-plain64
     hash: sha512
-    key_size: 512
+    key_size: 256
 
-system_device: /dev/mapper/{{inventory_hostname}}-crypt0
+data_device: /dev/mapper/{{inventory_hostname_short}}-crypt0
 
 debian_boot_packages:
   - cryptsetup
diff --git a/vars/crypt_profiles/none.yml b/vars/crypt_profiles/none.yml
index 243b357..e944100 100644
--- a/vars/crypt_profiles/none.yml
+++ b/vars/crypt_profiles/none.yml
@@ -1,5 +1,5 @@
 dmcrypt_devices: []
 
-system_device: "{{ system_device }}"
+data_device: "{{ data_device }}"
 
 debian_boot_packages: []
diff --git a/vars/profile.yml b/vars/profile.yml
index c904b52..c27999a 100644
--- a/vars/profile.yml
+++ b/vars/profile.yml
@@ -2,7 +2,7 @@
 volume_groups:
   - name: "{{primary_volume_group_name}}"
     devices:
-      - "{{ system_device }}"
+      - "{{ data_device }}"
 
 logical_volumes:
   - name: root
diff --git a/vars/raid_profiles/mirror.yml b/vars/raid_profiles/mirror.yml
index 6570cad..e949f67 100644
--- a/vars/raid_profiles/mirror.yml
+++ b/vars/raid_profiles/mirror.yml
@@ -5,13 +5,13 @@ mdraid_devices:
   - device: /dev/md/rescue
     level: 1
     devices: "{{ hard_disks | json_query(\"[].partitions[?usage=='rescue'][].device\") | list }}"
-  - device: /dev/md/system
+  - device: /dev/md/data
     level: 1
-    devices: "{{ hard_disks | json_query(\"[].partitions[?usage=='system'][].device\") | list }}"
+    devices: "{{ hard_disks | json_query(\"[].partitions[?usage=='data'][].device\") | list }}"
 
 boot_device: /dev/md/boot
 rescue_device: /dev/md/rescue
-system_device: /dev/md/system
+data_device: /dev/md/data
 
 debian_boot_packages:
   - mdadm
diff --git a/vars/raid_profiles/single.yml b/vars/raid_profiles/single.yml
index ab1d1c6..8cb40ca 100644
--- a/vars/raid_profiles/single.yml
+++ b/vars/raid_profiles/single.yml
@@ -2,6 +2,6 @@ mdraid_devices: []
 
 boot_device: "{{ hard_disks | json_query(\"[].partitions[?usage=='boot'][].device\") | first }}"
 rescue_device: "{{ hard_disks | json_query(\"[].partitions[?usage=='rescue'][].device\") | first }}"
-system_device: "{{ hard_disks | json_query(\"[].partitions[?usage=='system'][].device\") | first }}"
+data_device: "{{ hard_disks | json_query(\"[].partitions[?usage=='data'][].device\") | first }}"
 
 debian_boot_packages: []
diff --git a/vars/raid_profiles/strip.yml b/vars/raid_profiles/strip.yml
index e68ff16..2c09ec0 100644
--- a/vars/raid_profiles/strip.yml
+++ b/vars/raid_profiles/strip.yml
@@ -5,13 +5,13 @@ mdraid_devices:
   - device: /dev/md/rescue
     level: 1
     devices: "{{ hard_disks | json_query(\"[].partitions[?usage=='rescue'][].device\") | list }}"
-  - device: /dev/md/system
+  - device: /dev/md/data
     level: 0
-    devices: "{{ hard_disks | json_query(\"[].partitions[?usage=='system'][].device\") | list }}"
+    devices: "{{ hard_disks | json_query(\"[].partitions[?usage=='data'][].device\") | list }}"
 
 boot_device: /dev/md/boot
 rescue_device: /dev/md/rescue
-system_device: /dev/md/system
+data_device: /dev/md/data
 
 debian_boot_packages:
   - mdadm