diff --git a/config/aarch64/desktop.toml b/config/aarch64/desktop.toml
index 7677c1c..9161849 100644
--- a/config/aarch64/desktop.toml
+++ b/config/aarch64/desktop.toml
@@ -2,6 +2,8 @@
 
 # General settings
 [general]
+# Filesystem size in MiB
+filesystem_size = 256
 # Do not prompt if settings are not defined
 prompt = false
 
diff --git a/config/i686/desktop-minimal.toml b/config/i686/desktop-minimal.toml
index 195f376..da75d34 100644
--- a/config/i686/desktop-minimal.toml
+++ b/config/i686/desktop-minimal.toml
@@ -2,6 +2,8 @@
 
 # General settings
 [general]
+# Filesystem size in MiB
+filesystem_size = 128
 # Do not prompt if settings are not defined
 prompt = false
 
diff --git a/config/i686/desktop.toml b/config/i686/desktop.toml
index caef991..f94c826 100644
--- a/config/i686/desktop.toml
+++ b/config/i686/desktop.toml
@@ -2,6 +2,8 @@
 
 # General settings
 [general]
+# Filesystem size in MiB
+filesystem_size = 256
 # Do not prompt if settings are not defined
 prompt = false
 
diff --git a/config/i686/server-minimal.toml b/config/i686/server-minimal.toml
index 3372833..7574ca4 100644
--- a/config/i686/server-minimal.toml
+++ b/config/i686/server-minimal.toml
@@ -2,6 +2,8 @@
 
 # General settings
 [general]
+# Filesystem size in MiB
+filesystem_size = 64
 # Do not prompt if settings are not defined
 prompt = false
 
diff --git a/config/x86_64/acid.toml b/config/x86_64/acid.toml
index f97cbdb..57c064a 100644
--- a/config/x86_64/acid.toml
+++ b/config/x86_64/acid.toml
@@ -2,6 +2,8 @@
 
 # General settings
 [general]
+# Filesystem size in MiB
+filesystem_size = 256
 # Do not prompt if settings are not defined
 prompt = false
 
diff --git a/config/x86_64/demo.toml b/config/x86_64/demo.toml
index 854e6fa..64e27bf 100644
--- a/config/x86_64/demo.toml
+++ b/config/x86_64/demo.toml
@@ -24,6 +24,8 @@
 
 # General settings
 [general]
+# Filesystem size in MiB
+filesystem_size = 512
 # Do not prompt if settings are not defined
 prompt = false
 
diff --git a/config/x86_64/desktop.toml b/config/x86_64/desktop.toml
index a00a8f4..fd54f9e 100644
--- a/config/x86_64/desktop.toml
+++ b/config/x86_64/desktop.toml
@@ -2,6 +2,8 @@
 
 # General settings
 [general]
+# Filesystem size in MiB
+filesystem_size = 256
 # Do not prompt if settings are not defined
 prompt = false
 
diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml
index 1ae68fc..b98ea4c 100644
--- a/config/x86_64/jeremy.toml
+++ b/config/x86_64/jeremy.toml
@@ -2,6 +2,8 @@
 
 # General settings
 [general]
+# Filesystem size in MiB
+filesystem_size = 2048
 # Do not prompt if settings are not defined
 prompt = false
 
diff --git a/config/x86_64/resist.toml b/config/x86_64/resist.toml
index db56201..fba4a2e 100644
--- a/config/x86_64/resist.toml
+++ b/config/x86_64/resist.toml
@@ -2,6 +2,8 @@
 
 # General settings
 [general]
+# Filesystem size in MiB
+filesystem_size = 256
 # Do not prompt if settings are not defined
 prompt = false
 
diff --git a/config/x86_64/rustc.toml b/config/x86_64/rustc.toml
index 94fda37..9e01f4a 100644
--- a/config/x86_64/rustc.toml
+++ b/config/x86_64/rustc.toml
@@ -2,6 +2,8 @@
 
 # General settings
 [general]
+# Filesystem size in MiB
+filesystem_size = 1024
 # Do not prompt if settings are not defined
 prompt = false
 
diff --git a/config/x86_64/server.toml b/config/x86_64/server.toml
index 312fbe7..b8b471f 100644
--- a/config/x86_64/server.toml
+++ b/config/x86_64/server.toml
@@ -2,6 +2,8 @@
 
 # General settings
 [general]
+# Filesystem size in MiB
+filesystem_size = 256
 # Do not prompt if settings are not defined
 prompt = false
 
diff --git a/mk/ci.mk b/mk/ci.mk
index 73517df..27216bd 100644
--- a/mk/ci.mk
+++ b/mk/ci.mk
@@ -1,15 +1,13 @@
 IMG_TAG?=$(shell git describe --tags)
 IMG_SEPARATOR?=_
 IMG_DIR?=build/img
-DEMO_FS_SIZE?=1500
 
 # CI image target - build desktop, server and demo images
 # To leave out the build tag, set both IMG_TAG and IMG_SEPARATOR to null
 ci-img: FORCE
 	rm -rf $(IMG_DIR)
 	mkdir -p $(IMG_DIR)
-	$(MAKE) desktop server
-	$(MAKE) FILESYSTEM_SIZE=$(DEMO_FS_SIZE) demo
+	$(MAKE) demo desktop server
 	cd $(IMG_DIR) && sha256sum -b * > SHA256SUM
 
 # The name of the target must match the name of the filesystem config file
@@ -44,4 +42,3 @@ ci-toolchain: FORCE
 	cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(TARGET)/relibc-install.tar.gz"
 	cp "prefix/$(TARGET)/rust-install.tar.gz" "build/toolchain/$(TARGET)/rust-install.tar.gz"
 	cd "build/toolchain/$(TARGET)" && sha256sum -b * > SHA256SUM
-
diff --git a/mk/config.mk b/mk/config.mk
index 03f25ad..ea3a5c6 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -9,8 +9,8 @@ PREFIX_BINARY?=1
 REPO_BINARY?=0
 ## Select filesystem config
 FILESYSTEM_CONFIG?=config/$(ARCH)/desktop.toml
-## Filesystem size in MB (256 is the default)
-FILESYSTEM_SIZE?=256
+## Filesystem size in MB (default comes from filesystem_size in the FILESYSTEM_CONFIG)
+FILESYSTEM_SIZE?=$(shell grep filesystem_size $(FILESYSTEM_CONFIG) | cut -d' ' -f3)
 ## Flags to pass to redoxfs-mkfs. Add --encrypt to set up disk encryption
 REDOXFS_MKFS_FLAGS?=