diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 8c35f83d..6b85f1c5 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1224,8 +1224,8 @@ function image_setup_utils {
     fi
     chroot "$rootdir" apt-get -yq install tripwire
 
-    # mirroring
-    # cmake
+    # filesystem optimisations
+    sed -i 's|btrfs subvol=@|btrfs defaults,subvol=@,compress=lzo,ssd|g' $rootdir/etc/fstab
 }
 
 function image_install_nodejs {
diff --git a/src/freedombone-utils-filesystem b/src/freedombone-utils-filesystem
index 11dde6d3..9ce5e457 100755
--- a/src/freedombone-utils-filesystem
+++ b/src/freedombone-utils-filesystem
@@ -123,4 +123,8 @@ function defrag_filesystem {
     echo $'Defragmentation completed'
 }
 
+function optimise_filesystem {
+    sed -i 's|btrfs subvol=@|btrfs defaults,subvol=@,compress=lzo,ssd|g' /etc/fstab
+}
+
 # NOTE: deliberately no exit 0
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 56769800..5f21b45e 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -663,6 +663,9 @@ function setup_utils {
     function_check separate_tmp_filesystem
     separate_tmp_filesystem 150
 
+    function_check optimise_filesystem
+    optimise_filesystem
+
     function_check disable_null_passwords
     disable_null_passwords