diff --git a/boards/heltec_mesh_pocket.json b/boards/heltec_mesh_pocket.json
index 6fb48a4694..e6a04c1239 100644
--- a/boards/heltec_mesh_pocket.json
+++ b/boards/heltec_mesh_pocket.json
@@ -39,7 +39,7 @@
     "frameworks": ["arduino"],
     "name": "Heltec nrf (Adafruit BSP)",
     "upload": {
-      "maximum_ram_size": 248832,
+      "maximum_ram_size": 235520,
       "maximum_size": 815104,
       "speed": 115200,
       "protocol": "nrfutil",
diff --git a/boards/heltec_mesh_solar.json b/boards/heltec_mesh_solar.json
index c9125811ea..dcd1da64b1 100644
--- a/boards/heltec_mesh_solar.json
+++ b/boards/heltec_mesh_solar.json
@@ -42,7 +42,7 @@
   ],
   "name": "Heltec Mesh Solar Board",
   "upload": {
-    "maximum_ram_size": 248832,
+    "maximum_ram_size": 235520,
     "maximum_size": 815104,
     "speed": 115200,
     "protocol": "nrfutil",
diff --git a/boards/heltec_t114.json b/boards/heltec_t114.json
index 86f72e7364..a4a61d04cf 100644
--- a/boards/heltec_t114.json
+++ b/boards/heltec_t114.json
@@ -42,7 +42,7 @@
   ],
   "name": "Heltec T114 Board",
   "upload": {
-    "maximum_ram_size": 248832,
+    "maximum_ram_size": 235520,
     "maximum_size": 815104,
     "speed": 115200,
     "protocol": "nrfutil",
diff --git a/boards/minewsemi_me25ls01.json b/boards/minewsemi_me25ls01.json
index 4c943158dd..928acb0e6e 100644
--- a/boards/minewsemi_me25ls01.json
+++ b/boards/minewsemi_me25ls01.json
@@ -38,8 +38,8 @@
   "frameworks": ["arduino"],
   "name": "Minewsemi ME25LS01",
   "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
+    "maximum_ram_size": 235520,
+    "maximum_size": 811008,
     "speed": 115200,
     "protocol": "nrfutil",
     "protocols": [
diff --git a/boards/nano-g2-ultra.json b/boards/nano-g2-ultra.json
index 9fa22d7b17..3246167efe 100644
--- a/boards/nano-g2-ultra.json
+++ b/boards/nano-g2-ultra.json
@@ -54,7 +54,7 @@
     ],
     "name": "BQ nRF52840",
     "upload": {
-        "maximum_ram_size": 248832,
+        "maximum_ram_size": 235520,
         "maximum_size": 815104,
         "speed": 115200,
         "protocol": "nrfutil",
diff --git a/boards/promicro_nrf52840.json b/boards/promicro_nrf52840.json
index a428ffde10..a4460f3190 100644
--- a/boards/promicro_nrf52840.json
+++ b/boards/promicro_nrf52840.json
@@ -60,7 +60,7 @@
     ],
     "name": "ProMicro NRF52840",
     "upload": {
-      "maximum_ram_size": 248832,
+      "maximum_ram_size": 235520,
       "maximum_size": 815104,
       "speed": 115200,
       "protocol": "nrfutil",
diff --git a/boards/seeed-wio-tracker-l1.json b/boards/seeed-wio-tracker-l1.json
index 6235b8bff1..772727b6da 100644
--- a/boards/seeed-wio-tracker-l1.json
+++ b/boards/seeed-wio-tracker-l1.json
@@ -40,7 +40,7 @@
   ],
   "name": "Seeed Wio Tracker L1",
   "upload": {
-    "maximum_ram_size": 237568,
+    "maximum_ram_size": 235520,
     "maximum_size": 811008,
     "protocol": "nrfutil",
     "speed": 115200,
diff --git a/boards/seeed-xiao-afruitnrf52-nrf52840.json b/boards/seeed-xiao-afruitnrf52-nrf52840.json
index 78855cd7a1..9a60e0a797 100644
--- a/boards/seeed-xiao-afruitnrf52-nrf52840.json
+++ b/boards/seeed-xiao-afruitnrf52-nrf52840.json
@@ -40,7 +40,7 @@
   ],
   "name": "Seeed Studio XIAO nRF52840",
   "upload": {
-    "maximum_ram_size": 237568,
+    "maximum_ram_size": 235520,
     "maximum_size": 811008,
     "protocol": "nrfutil",
     "speed": 115200,
diff --git a/boards/seeed_sensecap_solar.json b/boards/seeed_sensecap_solar.json
index d6630d826d..50f089762f 100644
--- a/boards/seeed_sensecap_solar.json
+++ b/boards/seeed_sensecap_solar.json
@@ -39,8 +39,8 @@
   ],
   "name": "Seeed Studio XIAO nRF52840",
   "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
+    "maximum_ram_size": 235520,
+    "maximum_size": 811008,
     "protocol": "nrfutil",
     "speed": 115200,
     "protocols": [
diff --git a/boards/t-echo.json b/boards/t-echo.json
index 8deea1bcc6..c974ca650f 100644
--- a/boards/t-echo.json
+++ b/boards/t-echo.json
@@ -45,7 +45,7 @@
   ],
   "name": "LilyGo T-ECHO",
   "upload": {
-    "maximum_ram_size": 248832,
+    "maximum_ram_size": 235520,
     "maximum_size": 815104,
     "require_upload_port": true,
     "speed": 115200,
diff --git a/boards/thinknode_m1.json b/boards/thinknode_m1.json
index 9f48628565..5313d2a189 100644
--- a/boards/thinknode_m1.json
+++ b/boards/thinknode_m1.json
@@ -53,7 +53,7 @@
   ],
   "name": "elecrow eink",
   "upload": {
-    "maximum_ram_size": 248832,
+    "maximum_ram_size": 235520,
     "maximum_size": 815104,
     "speed": 115200,
     "use_1200bps_touch": true,
diff --git a/boards/tracker-t1000-e.json b/boards/tracker-t1000-e.json
index fc740ac5d3..330455f5e6 100644
--- a/boards/tracker-t1000-e.json
+++ b/boards/tracker-t1000-e.json
@@ -38,8 +38,8 @@
   "frameworks": ["arduino"],
   "name": "Seeed T1000-E",
   "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
+    "maximum_ram_size": 235520,
+    "maximum_size": 811008,
     "speed": 115200,
     "protocol": "nrfutil",
     "protocols": [
diff --git a/boards/wiscore_rak4631.json b/boards/wiscore_rak4631.json
new file mode 100644
index 0000000000..601974f66d
--- /dev/null
+++ b/boards/wiscore_rak4631.json
@@ -0,0 +1,76 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      [
+        "0x239A",
+        "0x8029"
+      ],
+      [
+        "0x239A",
+        "0x0029"
+      ],
+      [
+        "0x239A",
+        "0x002A"
+      ],
+      [
+        "0x239A",
+        "0x802A"
+      ]
+    ],
+    "usb_product": "WisCore RAK4631 Board",
+    "mcu": "nrf52840",
+    "variant": "WisCore_RAK4631_Board",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": [
+    "bluetooth"
+  ],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "onboard_tools": [
+      "jlink"
+    ],
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52.cfg"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "WisCore RAK4631 Board",
+  "upload": {
+    "maximum_ram_size": 235520,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "nrfutil",
+      "stlink"
+    ],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.rakwireless.com",
+  "vendor": "RAKwireless"
+}