diff --git a/.github/actions/build-variant/action.yml b/.github/actions/build-variant/action.yml
index 80d2a56bb..e0c5fba06 100644
--- a/.github/actions/build-variant/action.yml
+++ b/.github/actions/build-variant/action.yml
@@ -51,6 +51,7 @@ runs:
         file: build.tar
         target: build.tar
         token: ${{ inputs.github_token }}
+        version: v2.5.3
 
     - name: Unpack web ui
       if: inputs.include-web-ui == 'true'
diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
index 99e8693dc..d75f86306 100644
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -16,6 +16,7 @@ build_flags =
   -DLFS_NO_ASSERT                      ; Disable LFS assertions , see https://github.com/meshtastic/firmware/pull/3818
   -DMESHTASTIC_EXCLUDE_AUDIO=1
   -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
+  -DMAX_NUM_NODES=80
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
diff --git a/src/mesh/mesh-pb-constants.h b/src/mesh/mesh-pb-constants.h
index a055804d9..df7ae89e6 100644
--- a/src/mesh/mesh-pb-constants.h
+++ b/src/mesh/mesh-pb-constants.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <vector>
 
-#include "architecture.h"
+
 #include "mesh/generated/meshtastic/admin.pb.h"
 #include "mesh/generated/meshtastic/deviceonly.pb.h"
 #include "mesh/generated/meshtastic/localonly.pb.h"
@@ -21,12 +21,8 @@
 
 /// max number of nodes allowed in the mesh
 #ifndef MAX_NUM_NODES
-#ifdef ARCH_NRF52
-#define MAX_NUM_NODES 80
-#else
 #define MAX_NUM_NODES 100
 #endif
-#endif
 
 #define MAX_NUM_NODES_FS 100
 
diff --git a/version.properties b/version.properties
index bed14bad5..091ebde9e 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 5
-build = 14
+build = 13