diff --git a/group_vars/silverblue.yml b/group_vars/silverblue.yml
index 2062615..1c0eaf3 100644
--- a/group_vars/silverblue.yml
+++ b/group_vars/silverblue.yml
@@ -243,6 +243,20 @@ etc_sysctl_params:
     value: 524288
     state: present
 
+etc_fstab_entries:
+  root:
+    path: /
+    fstype: btrfs
+    opts: noatime,subvol=root,compress=zstd:1,x-systemd.device-timeout=0
+    passno: 0
+    dump: 0
+  home:
+    path: /home
+    fstype: btrfs
+    opts: subvol=home,compress=zstd:1,x-systemd.device-timeout=0
+    passno: 0
+    dump: 0
+
 users:
   flexo:
     shell: /bin/zsh
diff --git a/host_vars/chapek9.yml b/host_vars/chapek9.yml
index f86c289..85488c2 100644
--- a/host_vars/chapek9.yml
+++ b/host_vars/chapek9.yml
@@ -1,21 +1,11 @@
 ---
 etc_hostname: chapek9
 
-etc_fstab_entries:
+etc_fstab_entries_overwrite:
   root:
     src: UUID=254d6a53-398a-4a53-93d1-c45e61263791
-    path: /
-    fstype: btrfs
-    opts: noatime,subvol=root,compress=zstd:1,x-systemd.device-timeout=0
-    passno: 0
-    dump: 0
   home:
     src: UUID=254d6a53-398a-4a53-93d1-c45e61263791
-    path: /home
-    fstype: btrfs
-    opts: subvol=home,compress=zstd:1,x-systemd.device-timeout=0
-    passno: 0
-    dump: 0
 
 rpm_ostree_kargs_overwrite:
   'i915.enable_psr=0':
diff --git a/host_vars/ice9.yml b/host_vars/ice9.yml
index 90ba651..2c7ed4b 100644
--- a/host_vars/ice9.yml
+++ b/host_vars/ice9.yml
@@ -1,6 +1,12 @@
 ---
 etc_hostname: ice9
 
+etc_fstab_entries_overwrite:
+  root:
+    src: UUID=aa63fb86-3fc9-42d1-82ca-7d47d0238765
+  home:
+    src: UUID=aa63fb86-3fc9-42d1-82ca-7d47d0238765
+
 flatpak_flatpaks_overwrite:
   com.github.Bleuzen.FFaudioConverter:
     state: present
diff --git a/roles/etc/tasks/main.yml b/roles/etc/tasks/main.yml
index c1e5d58..28460eb 100644
--- a/roles/etc/tasks/main.yml
+++ b/roles/etc/tasks/main.yml
@@ -6,6 +6,13 @@
   become: yes
   when: etc_set_hostname | bool
 
+- name: Merge fstab entries
+  set_fact:
+    etc_fstab_entries: '{{ etc_fstab_entries | combine(etc_fstab_entries_overwrite, recursive=True) }}'
+  when:
+    - etc_fstab_entries_overwrite | default()
+    - etc_configure_fstab | bool
+
 - name: Configure fstab
   ansible.posix.mount:
     src: "{{ item.value.src }}"