diff --git a/.github/actions/phoenix-build/action.yml b/.github/actions/phoenix-build/action.yml
index 696ad6fe7..e66578927 100644
--- a/.github/actions/phoenix-build/action.yml
+++ b/.github/actions/phoenix-build/action.yml
@@ -42,7 +42,7 @@ runs:
     CI_CUSTOM_BUILDROOT: ${{ inputs.buildroot }}
     LONG_TEST: ${{ inputs.nightly == 'true' && 'y' || 'n' }}
   args:
-    - ${{ inputs.params }}  # note: params will be split by build.sh internally
+    - ${{ inputs.params }} ports # note: params will be split by build.sh internally
 
 # branding
 branding:
diff --git a/_targets/build.project.armv7a7-imx6ull b/_targets/build.project.armv7a7-imx6ull
index 981f03a4e..0fdbe6cba 100644
--- a/_targets/build.project.armv7a7-imx6ull
+++ b/_targets/build.project.armv7a7-imx6ull
@@ -28,6 +28,7 @@ export PORTS_LZO=y
 export PORTS_OPENVPN=y
 export PORTS_JANSSON=y
 export PORTS_CURL=y
+export PORTS_FS_MARK=y
 
 #
 # Platform dependent parameters
diff --git a/_targets/build.project.armv7a9-zynq7000 b/_targets/build.project.armv7a9-zynq7000
index 8be255c40..be008025a 100644
--- a/_targets/build.project.armv7a9-zynq7000
+++ b/_targets/build.project.armv7a9-zynq7000
@@ -14,6 +14,7 @@ CROSS=arm-phoenix-
 export PSH_DEFUSRPWDHASH="0B1ANiYi45IhxkfmUW155/GBd4IRE="
 
 export PORTS_BUSYBOX=y
+export PORTS_FS_MARK=y
 
 #
 # Default platform dependent parameters
diff --git a/_targets/build.project.armv7m4-stm32l4x6 b/_targets/build.project.armv7m4-stm32l4x6
index f734ae47d..d01214b04 100644
--- a/_targets/build.project.armv7m4-stm32l4x6
+++ b/_targets/build.project.armv7m4-stm32l4x6
@@ -28,6 +28,7 @@ export PORTS_LZO=n
 export PORTS_OPENVPN=n
 export PORTS_JANSSON=n
 export PORTS_CURL=n
+export PORTS_FS_MARK=y
 
 
 #
diff --git a/_targets/build.project.armv7m7-imxrt105x b/_targets/build.project.armv7m7-imxrt105x
index d93506f53..851ddef5a 100644
--- a/_targets/build.project.armv7m7-imxrt105x
+++ b/_targets/build.project.armv7m7-imxrt105x
@@ -31,6 +31,7 @@ export PORTS_CURL=n
 export PORTS_MICROPYTHON=n
 export PORTS_MBEDTLS=n
 export PORTS_AZURE_SDK=n
+export PORTS_FS_MARK=y
 
 
 #
diff --git a/_targets/build.project.armv7m7-imxrt106x b/_targets/build.project.armv7m7-imxrt106x
index 70b4effaa..471cafc4c 100644
--- a/_targets/build.project.armv7m7-imxrt106x
+++ b/_targets/build.project.armv7m7-imxrt106x
@@ -31,6 +31,7 @@ export PORTS_CURL=n
 export PORTS_MICROPYTHON=n
 export PORTS_MBEDTLS=n
 export PORTS_AZURE_SDK=n
+export PORTS_FS_MARK=y
 
 
 #
diff --git a/_targets/build.project.armv7m7-imxrt117x b/_targets/build.project.armv7m7-imxrt117x
index bf644a65b..f27a0a050 100644
--- a/_targets/build.project.armv7m7-imxrt117x
+++ b/_targets/build.project.armv7m7-imxrt117x
@@ -28,6 +28,7 @@ export PORTS_LZO=n
 export PORTS_OPENVPN=n
 export PORTS_JANSSON=n
 export PORTS_CURL=n
+export PORTS_FS_MARK=y
 
 
 
diff --git a/_targets/build.project.ia32-generic b/_targets/build.project.ia32-generic
index 6584954ae..28225e3a7 100644
--- a/_targets/build.project.ia32-generic
+++ b/_targets/build.project.ia32-generic
@@ -33,6 +33,7 @@ export PORTS_OPENVPN=y
 export PORTS_JANSSON=y
 export PORTS_CURL=y
 export PORTS_MICROPYTHON=y
+export PORTS_FS_MARK=y
 
 #
 # Platform dependent parameters
diff --git a/_targets/build.project.riscv64-generic b/_targets/build.project.riscv64-generic
index b97cf10ef..0a91a46d9 100644
--- a/_targets/build.project.riscv64-generic
+++ b/_targets/build.project.riscv64-generic
@@ -30,6 +30,7 @@ export PORTS_LZO=y
 export PORTS_OPENVPN=y
 export PORTS_JANSSON=y
 export PORTS_CURL=y
+export PORTS_FS_MARK=y
 
 
 #
diff --git a/phoenix-rtos-filesystems b/phoenix-rtos-filesystems
index c4fd8dedd..1b2c42b27 160000
--- a/phoenix-rtos-filesystems
+++ b/phoenix-rtos-filesystems
@@ -1 +1 @@
-Subproject commit c4fd8dedd0a274e515da74a57887d85bb449ec8f
+Subproject commit 1b2c42b27f47e099574f626a742a01595b2ec7c2
diff --git a/phoenix-rtos-ports b/phoenix-rtos-ports
index 9feddd4d1..22ae43108 160000
--- a/phoenix-rtos-ports
+++ b/phoenix-rtos-ports
@@ -1 +1 @@
-Subproject commit 9feddd4d11c57977c9af0abb85c73e5c3f9134c7
+Subproject commit 22ae43108b5777ca9f76000b2cc5a12bde8685e2
diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests
index a37c9150e..32bfdb095 160000
--- a/phoenix-rtos-tests
+++ b/phoenix-rtos-tests
@@ -1 +1 @@
-Subproject commit a37c9150ee5d031ba8b038832b5acec9719b3b56
+Subproject commit 32bfdb0953fab03f17f7cac77fe9369132a629b2