diff --git a/roles/install_arch/tasks/main.yml b/roles/install_arch/tasks/main.yml
index a0c7dd080dd8db4b068f32670f45b43e2a5b6c4c..7fc9b62d1e919121f558c8ec868f4fa28d128ae1 100644
--- a/roles/install_arch/tasks/main.yml
+++ b/roles/install_arch/tasks/main.yml
@@ -29,22 +29,15 @@
     - name: Set the no-use-tor option in dirmngr.conf
       lineinfile: name=/root/.gnupg/dirmngr.conf create=yes line=no-use-tor owner=root group=root mode=0644
 
-- name: Create GRUB embed partitions
-  command: sgdisk -g -I --clear -n 1:0:+1M {{ item }} -c 1:'BIOS boot partition' -t 1:ef02
-  with_items:
-    - "{{ system_disks }}"
-  register: sgdisk
-  changed_when: "sgdisk.rc == 0"
-
-- name: Create EFI system partitions
-  command: sgdisk -g -I -n 2:0:+512M {{ item }} -c 2:'EFI system partition' -t 2:ef00
-  with_items:
-    - "{{ system_disks }}"
-  register: sgdisk
-  changed_when: "sgdisk.rc == 0"
-
-- name: Create root partitions
-  command: sgdisk -I -n 3:0:0 {{ item }} -c 3:root -t 3:8304
+- name: Create partitions
+  command: >
+    sgdisk
+      --align-end
+      --clear
+      --new=0:0:+1M --change-name=0:'BIOS boot partition' --typecode=0:ef02
+      --new=0:0:+512M --change-name=0:'EFI system partition' --typecode=0:ef00
+      --new=0:0:0 --change-name=0:root --typecode=0:8304
+      {{ item }}
   with_items:
     - "{{ system_disks }}"
   register: sgdisk