diff --git a/calamares/modules/mount.conf b/calamares/modules/mount.conf
index bd376af..34d90ff 100644
--- a/calamares/modules/mount.conf
+++ b/calamares/modules/mount.conf
@@ -55,10 +55,17 @@ btrfsSubvolumes:
       # subvolume: ""
     - mountPoint: /home
       subvolume: /@home
+    - mountPoint: /root
+      subvolume: /@root
+    - mountPoint: /srv
+      subvolume: /@srv
     - mountPoint: /var/cache
       subvolume: /@cache
     - mountPoint: /var/log
       subvolume: /@log
+    - mountPoint: /var/tmp
+      subvolume: /@tmp
+
 
 # The name of the btrfs subvolume holding the swapfile.  This only used when
 # a swapfile is selected and the root filesystem is btrfs
@@ -112,11 +119,11 @@ btrfsSwapSubvol: /@swap
 #
 mountOptions:
     - filesystem: default
-      options: [ defaults ]
+      options: [ defaults, noatime ]
     - filesystem: efi
       options: [ defaults, umask=0077 ]
     - filesystem: btrfs
-      options: [ defaults, compress=zstd:1 ]
+      options: [ defaults, noatime, compress=zstd ]
     - filesystem: btrfs_swap
       options: [ defaults, noatime ]