diff --git a/config/aarch64/acid.toml b/config/aarch64/acid.toml
deleted file mode 100644
index 552a32d81..000000000
--- a/config/aarch64/acid.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration for "acid" testing
-
-include = ["../acid.toml"]
diff --git a/config/aarch64/auto-test.toml b/config/aarch64/auto-test.toml
deleted file mode 100644
index e7a4cbb66..000000000
--- a/config/aarch64/auto-test.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration for automated testing of essential test suites
-
-include = ["../auto-test.toml"]
diff --git a/config/aarch64/desktop-minimal.toml b/config/aarch64/desktop-minimal.toml
deleted file mode 100644
index fb09c1d09..000000000
--- a/config/aarch64/desktop-minimal.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal desktop configuration
-
-include = ["../desktop-minimal.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/aarch64/desktop.toml b/config/aarch64/desktop.toml
deleted file mode 100644
index e4e9fa6bc..000000000
--- a/config/aarch64/desktop.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Default build system configuration
-
-include = ["../desktop.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/aarch64/minimal.toml b/config/aarch64/minimal.toml
deleted file mode 100644
index 63c04fcea..000000000
--- a/config/aarch64/minimal.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal configuration
-
-include = ["../minimal.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/aarch64/os-test.toml b/config/aarch64/os-test.toml
deleted file mode 100644
index 1765fb640..000000000
--- a/config/aarch64/os-test.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for "os-test" testing
-
-include = ["../os-test.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/aarch64/server.toml b/config/aarch64/server.toml
deleted file mode 100644
index 978aa0d0f..000000000
--- a/config/aarch64/server.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Server configuration
-
-include = ["../server.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/aarch64/tests.toml b/config/aarch64/tests.toml
deleted file mode 100644
index 9af06ab91..000000000
--- a/config/aarch64/tests.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for testing
-
-include = ["../tests.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 10000
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/i586/acid.toml b/config/i586/acid.toml
deleted file mode 100644
index 552a32d81..000000000
--- a/config/i586/acid.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration for "acid" testing
-
-include = ["../acid.toml"]
diff --git a/config/i586/auto-test.toml b/config/i586/auto-test.toml
deleted file mode 100644
index e7a4cbb66..000000000
--- a/config/i586/auto-test.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration for automated testing of essential test suites
-
-include = ["../auto-test.toml"]
diff --git a/config/i586/desktop-minimal.toml b/config/i586/desktop-minimal.toml
deleted file mode 100644
index fb09c1d09..000000000
--- a/config/i586/desktop-minimal.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal desktop configuration
-
-include = ["../desktop-minimal.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/i586/desktop.toml b/config/i586/desktop.toml
deleted file mode 100644
index e4e9fa6bc..000000000
--- a/config/i586/desktop.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Default build system configuration
-
-include = ["../desktop.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/i586/minimal.toml b/config/i586/minimal.toml
deleted file mode 100644
index 63c04fcea..000000000
--- a/config/i586/minimal.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal configuration
-
-include = ["../minimal.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/i586/os-test.toml b/config/i586/os-test.toml
deleted file mode 100644
index 1765fb640..000000000
--- a/config/i586/os-test.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for "os-test" testing
-
-include = ["../os-test.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/i586/server.toml b/config/i586/server.toml
deleted file mode 100644
index 978aa0d0f..000000000
--- a/config/i586/server.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Server configuration
-
-include = ["../server.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/i586/tests.toml b/config/i586/tests.toml
deleted file mode 100644
index 9af06ab91..000000000
--- a/config/i586/tests.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for testing
-
-include = ["../tests.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 10000
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/riscv64gc/acid.toml b/config/riscv64gc/acid.toml
deleted file mode 100644
index 552a32d81..000000000
--- a/config/riscv64gc/acid.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration for "acid" testing
-
-include = ["../acid.toml"]
diff --git a/config/riscv64gc/auto-test.toml b/config/riscv64gc/auto-test.toml
deleted file mode 100644
index e7a4cbb66..000000000
--- a/config/riscv64gc/auto-test.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration for automated testing of essential test suites
-
-include = ["../auto-test.toml"]
diff --git a/config/riscv64gc/desktop-minimal.toml b/config/riscv64gc/desktop-minimal.toml
deleted file mode 100644
index d5872d0d6..000000000
--- a/config/riscv64gc/desktop-minimal.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal desktop configuration
-
-include = ["../desktop-minimal.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/riscv64gc/minimal.toml b/config/riscv64gc/minimal.toml
deleted file mode 100644
index f07d85fbc..000000000
--- a/config/riscv64gc/minimal.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal configuration
-
-include = ["../minimal.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/riscv64gc/os-test.toml b/config/riscv64gc/os-test.toml
deleted file mode 100644
index 1765fb640..000000000
--- a/config/riscv64gc/os-test.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for "os-test" testing
-
-include = ["../os-test.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/riscv64gc/server.toml b/config/riscv64gc/server.toml
deleted file mode 100644
index 01f518228..000000000
--- a/config/riscv64gc/server.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Server configuration
-
-include = ["../server.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/riscv64gc/tests.toml b/config/riscv64gc/tests.toml
deleted file mode 100644
index 9af06ab91..000000000
--- a/config/riscv64gc/tests.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for testing
-
-include = ["../tests.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 10000
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/x86_64/acid.toml b/config/x86_64/acid.toml
deleted file mode 100644
index 552a32d81..000000000
--- a/config/x86_64/acid.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration for "acid" testing
-
-include = ["../acid.toml"]
diff --git a/config/x86_64/auto-test.toml b/config/x86_64/auto-test.toml
deleted file mode 100644
index e7a4cbb66..000000000
--- a/config/x86_64/auto-test.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration for automated testing of essential test suites
-
-include = ["../auto-test.toml"]
diff --git a/config/x86_64/desktop-minimal.toml b/config/x86_64/desktop-minimal.toml
deleted file mode 100644
index fb09c1d09..000000000
--- a/config/x86_64/desktop-minimal.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal desktop configuration
-
-include = ["../desktop-minimal.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/x86_64/desktop.toml b/config/x86_64/desktop.toml
deleted file mode 100644
index ab1670ba4..000000000
--- a/config/x86_64/desktop.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Default build system configuration
-
-include = ["../desktop.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml
deleted file mode 100644
index ecd30849a..000000000
--- a/config/x86_64/dev.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for development
-
-include = ["../dev.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/x86_64/minimal.toml b/config/x86_64/minimal.toml
deleted file mode 100644
index 63c04fcea..000000000
--- a/config/x86_64/minimal.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal configuration
-
-include = ["../minimal.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/x86_64/os-test.toml b/config/x86_64/os-test.toml
deleted file mode 100644
index 1765fb640..000000000
--- a/config/x86_64/os-test.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for "os-test" testing
-
-include = ["../os-test.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/x86_64/server.toml b/config/x86_64/server.toml
deleted file mode 100644
index 978aa0d0f..000000000
--- a/config/x86_64/server.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Server configuration
-
-include = ["../server.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/x86_64/tests.toml b/config/x86_64/tests.toml
deleted file mode 100644
index 9af06ab91..000000000
--- a/config/x86_64/tests.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for testing
-
-include = ["../tests.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 10000
-
-# Package settings
-[packages]
-# example = {}
diff --git a/config/x86_64/wayland.toml b/config/x86_64/wayland.toml
deleted file mode 100644
index f842b0936..000000000
--- a/config/x86_64/wayland.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wayland configuration
-
-include = ["../wayland.toml"]
diff --git a/config/x86_64/x11.toml b/config/x86_64/x11.toml
deleted file mode 100644
index e17676a2b..000000000
--- a/config/x86_64/x11.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# X11 configuration
-
-include = ["../x11.toml"]
diff --git a/mk/config.mk b/mk/config.mk
index b743de5c1..96dad5d86 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -32,7 +32,11 @@ ifeq ($(ARCH),i686)
 endif
 ## Select filesystem config
 ifeq ($(BOARD),)
+ifeq ($(wildcard config/$(ARCH)/$(CONFIG_NAME).toml),)
+FILESYSTEM_CONFIG?=config/$(CONFIG_NAME).toml
+else
 FILESYSTEM_CONFIG?=config/$(ARCH)/$(CONFIG_NAME).toml
+endif
 else
 FILESYSTEM_CONFIG?=config/$(ARCH)/$(BOARD)/$(CONFIG_NAME).toml
 endif