diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c92c4e1..bf2a228 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,6 +29,9 @@ jobs:
           - platform: ds1621p
             version: 7.1.0-42661
 
+          - platform: ds2422p
+            version: 7.0.1-42218
+
           - platform: ds3615xs
             version: 6.2.4-25556
           - platform: ds3615xs
diff --git a/docker/Makefile b/docker/Makefile
index efa6bc1..a210e2b 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -34,7 +34,13 @@ build_redpill_load:
 	@read -a KVERS <<< "$$(modinfo --field=vermagic redpill-lkm/redpill.ko)" && \
 	cp -f $(REDPILL_LKM_SRC)/redpill.ko $(REDPILL_LOAD_SRC)/ext/rp-lkm/redpill-linux-v$${KVERS[0]}.ko
 	./helper.sh
-	pushd $(REDPILL_LOAD_SRC) && ./build-loader.sh '$(TARGET_NAME)' '$(TARGET_VERSION)-$(TARGET_REVISION)'
+	@if [ "$(TARGET_NAME)" == "DS1621+" ]; then \
+		pushd $(REDPILL_LOAD_SRC) && \
+		BRP_JUN_MOD=1 ./build-loader.sh '$(TARGET_NAME)' '$(TARGET_VERSION)-$(TARGET_REVISION)'; \
+	else; \
+		pushd $(REDPILL_LOAD_SRC) && ./build-loader.sh '$(TARGET_NAME)' '$(TARGET_VERSION)-$(TARGET_REVISION)'; \
+	fi
+
 
 .PHONY: build_all
 build_all: build_redpill_lkm build_redpill_load
diff --git a/global_config.json b/global_config.json
index 063ee6f..0692ba4 100644
--- a/global_config.json
+++ b/global_config.json
@@ -73,6 +73,33 @@
         "branch": "develop"
       }
     },
+    {
+      "id": "ds2422p-7.1.0-42661",
+      "platform_name": "DS2422+",
+      "platform_version": "v1000-7.1.0-42661",
+      "user_config_json": "ds2422p_user_config.json",
+      "docker_base_image": "debian:10-slim",
+      "compile_with": "toolkit_dev",
+      "redpill_lkm_make_target": "dev-v7",
+      "downloads": {
+        "kernel": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/Synology%20NAS%20GPL%20Source/25426branch/v1000-source/linux-4.4.x.txz/download",
+          "sha256": "d3e85eb80f16a83244fcae6016ab6783cd8ac55e3af2b4240455261396e1e1be"
+        },
+        "toolkit_dev": {
+          "url": "https://sourceforge.net/projects/dsgpl/files/toolkit/DSM7.0/ds.v1000-7.0.dev.txz/download",
+          "sha256": "6108f9f7b7f0a13ee985314aef9419303375ab7ded4112be991590339b66ecd1"
+        }
+      },
+      "redpill_lkm": {
+        "source_url": "https://github.com/jumkey/redpill-lkm.git",
+        "branch": "develop"
+      },
+      "redpill_load": {
+        "source_url": "https://github.com/jumkey/redpill-load.git",
+        "branch": "develop"
+      }
+    },
     {
       "id": "ds3615xs-6.2.4-25556",
       "platform_name": "DS3615xs",
@@ -449,12 +476,7 @@
       "redpill_load": {
         "source_url": "https://github.com/pocopico/redpill-load.git",
         "branch": "develop"
-      },
-      "add_extensions": [
-        {
-          "redpill-misc": "https://github.com/pocopico/redpill-load/raw/master/redpill-misc/rpext-index.json"
-        }
-      ]
+      }
     }
   ]
 }
diff --git a/redpill_tool_chain.sh b/redpill_tool_chain.sh
index e31f00e..5d5d8b4 100755
--- a/redpill_tool_chain.sh
+++ b/redpill_tool_chain.sh
@@ -99,6 +99,7 @@ function runContainer(){
             BINDS+="--volume $(realpath ${HOST_PATH}):${CONTAINER_PATH} "
         done
     fi
+    BINDS+="--volume $(realpath docker/helper.sh):/opt/helper.sh "
     docker run --privileged --rm  $( [ "${CMD}" == "run" ] && echo " --interactive") --tty \
         --name redpill-tool-chain \
         --hostname redpill-tool-chain \