diff --git a/board/common/rootfs/etc/fstab b/board/common/rootfs/etc/fstab
index fc5850c7..70d11aac 100644
--- a/board/common/rootfs/etc/fstab
+++ b/board/common/rootfs/etc/fstab
@@ -15,9 +15,9 @@ cfgfs		/config		configfs	nofail,noauto		0	0
 # The chosen backing storage for the overlays placed on /cfg, /etc,
 # /home, /root, and /var, are determined dynamically by /usr/libexec/infix/mnt
 # depending on the available devices.
-mnttmp		/mnt/tmp	tmpfs	defaults				0	0
-LABEL=aux	/mnt/aux	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
-LABEL=var	/mnt/var	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
-LABEL=cfg	/mnt/cfg	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
-hostfs		/mnt/host	9p	cache=none,msize=16384,noauto		0	0
-/usr/libexec/infix/mnt#	/cfg	helper	none					0	0
+mnttmp		/mnt/tmp	tmpfs	defaults					0	0
+LABEL=aux	/mnt/aux	auto	noatime,nodiratime,noauto,errors=remount-ro	0	0
+LABEL=var	/mnt/var	ext4	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
+LABEL=cfg	/mnt/cfg	ext4	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
+hostfs		/mnt/host	9p	cache=none,msize=16384,noauto			0	0
+/usr/libexec/infix/mnt#	/cfg	helper	none						0	0
diff --git a/board/common/rootfs/usr/libexec/infix/mnt b/board/common/rootfs/usr/libexec/infix/mnt
index fdc71f1a..852ead56 100755
--- a/board/common/rootfs/usr/libexec/infix/mnt
+++ b/board/common/rootfs/usr/libexec/infix/mnt
@@ -292,8 +292,10 @@ mount_rw()
 
     # TODO: Also look for UBI partitions
 
-    # 
-    tune2fs -c 0 -i 0 LABEL="$1" 2>/dev/null 
+    # Disable periodic fsck, yet keeping safety checks on ext4
+    if grep "LABEL=$label" /etc/fstab |grep -q ext4; then
+	tune2fs -c 0 -i 0 LABEL="$1" 2>/dev/null
+    fi
     mount LABEL="$1" 2>/dev/null && return 0
 
     return 1