diff --git a/docker/ask.Dockerfile b/docker/ask.Dockerfile
index 065ded2..533c26c 100644
--- a/docker/ask.Dockerfile
+++ b/docker/ask.Dockerfile
@@ -197,11 +197,11 @@ ARG DEVICE_TREE_TARGET
 
 RUN cd /src/linux \
  && grep -q "^dtb-\\\$(CONFIG_ARCH_LAYERSCAPE) += ${DEVICE_TREE_TARGET}.dtb$" \
-      arch/arm64/boot/dts/freescale/Makefile \
-    || echo "dtb-\$(CONFIG_ARCH_LAYERSCAPE) += ${DEVICE_TREE_TARGET}.dtb" \
-      >> arch/arm64/boot/dts/freescale/Makefile \
+	  arch/arm64/boot/dts/freescale/Makefile \
+	|| echo "dtb-\$(CONFIG_ARCH_LAYERSCAPE) += ${DEVICE_TREE_TARGET}.dtb" \
+	  >> arch/arm64/boot/dts/freescale/Makefile \
  && make ARCH="${ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" \
-      "freescale/${DEVICE_TREE_TARGET}.dtb"
+	  "freescale/${DEVICE_TREE_TARGET}.dtb"
 
 # Patch verdor's modules
 RUN mkdir -p /src/patches/ask
@@ -279,6 +279,11 @@ RUN KERNEL_VER=$(ls /out/rootfs/lib/modules/) && \
 	depmod -b /out/rootfs $KERNEL_VER && \
 	cd /out && tar zcf rootfs.tar.gz rootfs
 
+RUN mkdir -p /out/rootfs-cfg/etc/dpa && \
+	cp -r "${ASK_DIR}/dpa_app/files/etc/"* /out/rootfs-cfg/etc/dpa/ && \
+	cp "${ASK_DIR}/config/gateway-dk/cdx_cfg.xml" /out/rootfs-cfg/etc/dpa/ && \
+	cp -r /src/fmc/etc /out/rootfs-cfg/etc
+
 FROM scratch AS export
 
 ARG DEVICE_TREE_TARGET
@@ -292,8 +297,5 @@ COPY --from=build \
 	/src/linux/arch/arm64/boot/dts/freescale/${DEVICE_TREE_TARGET}.dtb \
 	/kernel/
 
-# Grab the proprietary Mono Gateway XML configs
-COPY --from=build \
-	/src/ASK/config/gateway-dk/cdx_cfg.xml \
-	/src/ASK/dpa_app/files/etc/cdx_pcd.xml \
-	/xml/
+# Export the configs for Gateway Development Kit
+COPY --from=build /out/rootfs-cfg/ /rootfs-cfg/
diff --git a/patches/ask/config/0001-gateway-dk-cdx-cfg-use-standard-offline-portids.patch b/patches/ask/config/0001-gateway-dk-cdx-cfg-use-standard-offline-portids.patch
new file mode 100644
index 0000000..35bb9a4
--- /dev/null
+++ b/patches/ask/config/0001-gateway-dk-cdx-cfg-use-standard-offline-portids.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: builder <builder@localhost>
+Date: Sun, 10 May 2026 00:00:00 +0000
+Subject: [PATCH] gateway-dk: use standard CDX offline port IDs
+
+The CDX soft-parser logic treats logical port IDs >= 9 as offline
+ports, and the bundled CDX configs consistently use portid 9 and 10
+for dpa-fman0-oh@2 and dpa-fman0-oh@3.
+
+Keep the Gateway DK OFFLINE port numbers unchanged, because number 1
+and 2 are what dpa_app maps to dpa-fman0-oh@2 and dpa-fman0-oh@3.
+Only adjust the logical port IDs.
+---
+ config/gateway-dk/cdx_cfg.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config/gateway-dk/cdx_cfg.xml b/config/gateway-dk/cdx_cfg.xml
+index 1111111..2222222 100644
+--- a/config/gateway-dk/cdx_cfg.xml
++++ b/config/gateway-dk/cdx_cfg.xml
+@@ -11,8 +11,8 @@
+     <port type="10G" number="1" policy="cdx_ethport_7_policy" portid="7"/>
+     <!-- OFFLINE ports for CDX -->
+     <!-- number="1" -> dpa-fman0-oh@2 (IPsec), number="2" -> dpa-fman0-oh@3 (WiFi) -->
+-    <port type="OFFLINE" number="1" policy="cdx_port_of2_policy" portid="8"/>
+-    <port type="OFFLINE" number="2" policy="cdx_port_of3_policy" portid="9"/>
++    <port type="OFFLINE" number="1" policy="cdx_port_of2_policy" portid="9"/>
++    <port type="OFFLINE" number="2" policy="cdx_port_of3_policy" portid="10"/>
+   </engine>
+ </config>
+ </cfgdata>
+-- 
+2.43.0