diff --git a/server/build-docker.sh b/server/build-docker.sh
index c92bd57d..05bed9d8 100755
--- a/server/build-docker.sh
+++ b/server/build-docker.sh
@@ -35,7 +35,7 @@ for request in $REQUESTED; do
             INSTALL="wine ps5-10000 ps5-12000"
             ;;
         nintendo)
-            INSTALL="wine nssdk-1832"
+            INSTALL="wine nssdk-1832 nssdk-2143"
             ;;
         android)
             INSTALL="android android-ndk25 android-ndk25_sdk36"
diff --git a/server/configs/application-local-dev-app.yml b/server/configs/application-local-dev-app.yml
index 038e79b3..67b25d97 100644
--- a/server/configs/application-local-dev-app.yml
+++ b/server/configs/application-local-dev-app.yml
@@ -23,9 +23,9 @@ extender:
             linux-arm64-latest:
                 url: http://linux-arm64:9000
                 instanceId: linux-arm64
-            nssdk-1832:
-                url: http://nssdk-1832:9000
-                instanceId: nssdk-1832
+            nssdk-2143:
+                url: http://nssdk-2143:9000
+                instanceId: nssdk-2143
             ps4-12500:
                 url: http://ps4-12500:9000
                 instanceId: ps4-12500
diff --git a/server/configs/application-test-app.yml b/server/configs/application-test-app.yml
index 84af2aff..0af346c0 100644
--- a/server/configs/application-test-app.yml
+++ b/server/configs/application-test-app.yml
@@ -19,9 +19,9 @@ extender:
             linux-arm64-latest:
                 url: http://linux-arm64:9000
                 instanceId: linux-arm64
-            nssdk-1832:
-                url: http://nssdk-1832:9000
-                instanceId: nssdk-1832
+            nssdk-2143:
+                url: http://nssdk-2143:9000
+                instanceId: nssdk-2143
             ps4-12500:
                 url: http://ps4-12500:9000
                 instanceId: ps4-12500
diff --git a/server/docker/Dockerfile.nssdk.2143-env b/server/docker/Dockerfile.nssdk.2143-env
new file mode 100644
index 00000000..33c3f2d7
--- /dev/null
+++ b/server/docker/Dockerfile.nssdk.2143-env
@@ -0,0 +1,10 @@
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.5.0
+
+ENV NINTENDO_SDK_VERSION=21.4.3
+ENV NINTENDO_SDK_ROOT=${PLATFORMSDK_DIR}/nx-${NINTENDO_SDK_VERSION}
+ENV SWITCH_SDK_FILENAME=nx64-sdk-${NINTENDO_SDK_VERSION}.tar.gz
+
+RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \
+   echo "Switch SDK ${NINTENDO_SDK_VERSION}" && \
+   mkdir -p ${NINTENDO_SDK_ROOT} && \
+   wget -q -O - $(cat /run/secrets/DM_PACKAGES_URL)/${SWITCH_SDK_FILENAME} | tar xz -C ${NINTENDO_SDK_ROOT}
\ No newline at end of file
diff --git a/server/docker/docker-compose.yml b/server/docker/docker-compose.yml
index e1df8fd4..56afc927 100644
--- a/server/docker/docker-compose.yml
+++ b/server/docker/docker-compose.yml
@@ -115,13 +115,13 @@ services:
       default:
         aliases:
           - emsdk-406
-  nssdk_1832-dev:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-nintendo-private-registry/extender-nssdk-1832-env:latest
+  nssdk_2143-dev:
+    image: europe-west1-docker.pkg.dev/extender-426409/extender-nintendo-private-registry/extender-nssdk-2143-env:latest
     extends:
       file: common-services.yml
       service: remote_builder
     environment:
-      - INSTANCE_ID=nssdk-1832-local
+      - INSTANCE_ID=nssdk-2143-local
     profiles:
       - all
       - consoles
@@ -129,7 +129,7 @@ services:
     networks:
       default:
         aliases:
-          - nssdk-1832
+          - nssdk-2143
   ps4_12500-dev:
     image: europe-west1-docker.pkg.dev/extender-426409/extender-ps4-private-registry/extender-ps4-12500-env:latest
     extends: