diff --git a/platformio.ini b/platformio.ini
index 98b93c34d..e8348e002 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -7,6 +7,8 @@ default_envs = tbeam
 extra_configs =
 	arch/*/*.ini
 	variants/*/platformio.ini
+	src/graphics/niche/InkHUD/PlatformioConfig.ini
+
 description = Meshtastic
 
 [env]
@@ -77,7 +79,7 @@ lib_deps =
 	${env.lib_deps}
 	end2endzone/NonBlockingRTTTL@1.3.0
 build_flags = ${env.build_flags} -Os
-build_src_filter = ${env.build_src_filter} -<platform/portduino/>
+build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>
 
 ; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]
diff --git a/src/graphics/niche/InkHUD/PlatformioConfig.ini b/src/graphics/niche/InkHUD/PlatformioConfig.ini
index 7eb1d34e9..0a70f1d0e 100644
--- a/src/graphics/niche/InkHUD/PlatformioConfig.ini
+++ b/src/graphics/niche/InkHUD/PlatformioConfig.ini
@@ -1,6 +1,5 @@
 [inkhud]
-board_level = extra
-build_src_filter = +<../variants/$PIOENV> ; Include nicheGraphics.h
+build_src_filter = +<../variants/$PIOENV> +<graphics/niche/>; Include nicheGraphics.h
 build_flags = 
   -D MESHTASTIC_INCLUDE_NICHE_GRAPHICS ; Use NicheGraphics
   -D MESHTASTIC_INCLUDE_INKHUD ; Use InkHUD (a NicheGraphics UI)
diff --git a/variants/heltec_vision_master_e213/platformio.ini b/variants/heltec_vision_master_e213/platformio.ini
index 3d8f2e7cd..00fffdfd9 100644
--- a/variants/heltec_vision_master_e213/platformio.ini
+++ b/variants/heltec_vision_master_e213/platformio.ini
@@ -19,9 +19,6 @@ lib_deps =
   lewisxhe/PCF8563_Library@^1.0.1
 upload_speed = 115200
 
-; Using experimental InkHUD UI (work in progress)
-[platformio]
-extra_configs = src/graphics/niche/InkHUD/PlatformioConfig.ini
 [env:heltec-vision-master-e213-inkhud]
 extends = esp32s3_base, inkhud
 board = heltec_vision_master_e213
diff --git a/variants/heltec_vision_master_e290/platformio.ini b/variants/heltec_vision_master_e290/platformio.ini
index d3aa85d65..232b13559 100644
--- a/variants/heltec_vision_master_e290/platformio.ini
+++ b/variants/heltec_vision_master_e290/platformio.ini
@@ -23,9 +23,6 @@ lib_deps =
   lewisxhe/PCF8563_Library@^1.0.1
 upload_speed = 115200
 
-; Using experimental InkHUD UI (work in progress)
-[platformio]
-extra_configs = src/graphics/niche/InkHUD/PlatformioConfig.ini
 [env:heltec-vision-master-e290-inkhud]
 extends = esp32s3_base, inkhud
 board = heltec_vision_master_e290
diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini
index 36dbfd35b..b32b60dd5 100644
--- a/variants/heltec_wireless_paper/platformio.ini
+++ b/variants/heltec_wireless_paper/platformio.ini
@@ -20,9 +20,6 @@ lib_deps =
   lewisxhe/PCF8563_Library@^1.0.1
 upload_speed = 115200
 
-; Using experimental InkHUD UI (work in progress)
-[platformio]
-extra_configs = src/graphics/niche/InkHUD/PlatformioConfig.ini
 [env:heltec-wireless-paper-inkhud]
 extends = esp32s3_base, inkhud
 board = heltec_wifi_lora_32_V3
diff --git a/variants/t-echo/platformio.ini b/variants/t-echo/platformio.ini
index e0e26fe6a..bca760453 100644
--- a/variants/t-echo/platformio.ini
+++ b/variants/t-echo/platformio.ini
@@ -24,9 +24,6 @@ lib_deps =
   lewisxhe/PCF8563_Library@^1.0.1
 ;upload_protocol = fs
 
-; Using experimental InkHUD UI (work in progress)
-[platformio]
-extra_configs = src/graphics/niche/InkHUD/PlatformioConfig.ini
 [env:t-echo-inkhud]
 extends = nrf52840_base, inkhud
 board = t-echo