diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index efdb3f7af..3de08ff7b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,11 +57,6 @@ jobs:
           cache: 'pip'
     - name: Install PlatformIO
       run: pip install -r requirements.txt
-    - name: Add usermods environment
-      run: |
-        cp -v usermods/platformio_override.usermods.ini platformio_override.ini
-        echo -n "custom_usermods = " >> platformio_override.ini
-        find usermods/ -name library.json | xargs dirname | xargs -n 1 basename | xargs echo >> platformio_override.ini
 
     - name: Build firmware
       run: pio run -e ${{ matrix.environment }}
diff --git a/pio-scripts/load_usermods.py b/pio-scripts/load_usermods.py
index 81cbc7bff..76359a7a6 100644
--- a/pio-scripts/load_usermods.py
+++ b/pio-scripts/load_usermods.py
@@ -2,6 +2,11 @@ Import('env')
 from pathlib import Path   # For OS-agnostic path manipulation
 
 usermod_dir = Path(env["PROJECT_DIR"]) / "usermods"
+all_usermods = [f for f in usermod_dir.iterdir() if f.is_dir() and f.joinpath('library.json').exists()]
+
+if env['PIOENV'] == "usermods":
+   # Add all usermods
+   env.GetProjectConfig().set(f"env:usermods", 'custom_usermods', " ".join([f.name for f in all_usermods]))
 
 def find_usermod(mod: str):
   """Locate this library in the usermods folder.
diff --git a/platformio.ini b/platformio.ini
index 93219d2f7..57919e2d2 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -632,3 +632,4 @@ build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_RELEASE_NAME=\"USERMODS\"
   ${esp32.AR_build_flags}
 lib_deps = ${esp32.lib_deps}
+board_build.partitions = ${esp32.big_partitions}
diff --git a/usermods/platformio_override.usermods.ini b/usermods/platformio_override.usermods.ini
deleted file mode 100644
index 3b3e6696e..000000000
--- a/usermods/platformio_override.usermods.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[env:usermods]
-board = esp32dev
-platform = ${esp32.platform}
-platform_packages = ${esp32.platform_packages}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_RELEASE_NAME=\"USERMODS\"
-  ${esp32.AR_build_flags}
-lib_deps = ${esp32.lib_deps}
-board_build.partitions = ${esp32.big_partitions}