diff --git a/.github/workflows/docker_manifest.yml b/.github/workflows/docker_manifest.yml
index 28dbf8c21..d1d1a5634 100644
--- a/.github/workflows/docker_manifest.yml
+++ b/.github/workflows/docker_manifest.yml
@@ -128,9 +128,14 @@ jobs:
             }
           }
 
-          with open(os.environ['GITHUB_OUTPUT'], 'a') as fh:
-            fh.write(f"debian={','.join(tags[release_channel]['debian'])}\n")
-            fh.write(f"alpine={','.join(tags[release_channel]['alpine'])}\n")
+          with open(os.environ["GITHUB_OUTPUT"], "a") as fh:
+            fh.write("debian<<EOF\n")
+            fh.write("\n".join(tags[release_channel]["debian"]))
+            fh.write("\nEOF\n")
+
+            fh.write("alpine<<EOF\n")
+            fh.write("\n".join(tags[release_channel]["alpine"]))
+            fh.write("\nEOF\n")
         id: tags
 
       - name: Docker login
@@ -144,14 +149,16 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: meshtastic/meshtasticd
-          tags: ${{ steps.tags.outputs.debian }}
+          tags: |
+            ${{ steps.tags.outputs.debian }}
           flavor: latest=false
 
       - name: Create Docker manifest (Debian)
         id: manifest_debian
         uses: int128/docker-manifest-create-action@v2
         with:
-          tags: ${{ steps.meta_debian.outputs.tags }}
+          tags: |
+            ${{ steps.meta_debian.outputs.tags }}
           push: true
           sources: |
             meshtastic/meshtasticd@${{ needs.docker-debian-amd64.outputs.digest }}
@@ -163,13 +170,15 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: meshtastic/meshtasticd
-          tags: ${{ steps.tags.outputs.alpine }}
+          tags: |
+            ${{ steps.tags.outputs.alpine }}
 
       - name: Create Docker manifest (Alpine)
         id: manifest_alpine
         uses: int128/docker-manifest-create-action@v2
         with:
-          tags: ${{ steps.meta_alpine.outputs.tags }}
+          tags: |
+            ${{ steps.meta_alpine.outputs.tags }}
           push: true
           sources: |
             meshtastic/meshtasticd@${{ needs.docker-alpine-amd64.outputs.digest }}
diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
index 57b276978..b68977c78 100644
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -4,7 +4,7 @@ platform = platformio/nordicnrf52@^10.7.0
 extends = arduino_base
 platform_packages =
   ; our custom Git version until they merge our PR
-  framework-arduinoadafruitnrf52 @ https://github.com/geeksville/Adafruit_nRF52_Arduino.git
+  framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
   toolchain-gccarmnoneeabi@~1.90301.0
 
 build_type = debug
diff --git a/debian/changelog b/debian/changelog
index a1a359cfb..1b371296b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-meshtasticd (2.5.20.0) UNRELEASED; urgency=medium
+meshtasticd (2.5.21.0) UNRELEASED; urgency=medium
 
   * Initial packaging
   * GitHub Actions Automatic version bump
   * GitHub Actions Automatic version bump
+  * GitHub Actions Automatic version bump
 
- -- Austin Lane <github-actions[bot]@users.noreply.github.com>  Wed, 15 Jan 2025 14:08:54 +0000
+ -- Austin Lane <github-actions[bot]@users.noreply.github.com>  Sat, 25 Jan 2025 01:39:16 +0000
diff --git a/protobufs b/protobufs
index fde27e4ef..7f13df0e5 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit fde27e4ef0fcee967063ba353422ed5f9a1c4790
+Subproject commit 7f13df0e5f7cbb07f0e6f3a57c0d86ad448738db
diff --git a/src/SafeFile.cpp b/src/SafeFile.cpp
index 94232e81d..c942aa0ee 100644
--- a/src/SafeFile.cpp
+++ b/src/SafeFile.cpp
@@ -8,9 +8,8 @@ static File openFile(const char *filename, bool fullAtomic)
     concurrency::LockGuard g(spiLock);
     LOG_DEBUG("Opening %s, fullAtomic=%d", filename, fullAtomic);
 #ifdef ARCH_NRF52
-    File file = FSCom.open(filename, FILE_O_WRITE);
-    file.seek(0);
-    return file;
+    FSCom.remove(filename);
+    return FSCom.open(filename, FILE_O_WRITE);
 #endif
     if (!fullAtomic)
         FSCom.remove(filename); // Nuke the old file to make space (ignore if it !exists)
@@ -59,9 +58,6 @@ bool SafeFile::close()
         return false;
 
     spiLock->lock();
-#ifdef ARCH_NRF52
-    f.truncate();
-#endif
     f.close();
     spiLock->unlock();
 
diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h
index 5cd23c8e3..3353a020f 100644
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -223,6 +223,9 @@ typedef enum _meshtastic_HardwareModel {
     /* Mesh-Tab, esp32 based
  https://github.com/valzzu/Mesh-Tab */
     meshtastic_HardwareModel_MESH_TAB = 86,
+    /* MeshLink board developed by LoraItalia. NRF52840, eByte E22900M22S (Will also come with other frequencies), 25w MPPT solar charger (5v,12v,18v selectable), support for gps, buzzer, oled or e-ink display, 10 gpios, hardware watchdog
+ https://www.loraitalia.it */
+    meshtastic_HardwareModel_MESHLINK = 87,
     /* ------------------------------------------------------------------------------------------------------------------------------------------
  Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
  ------------------------------------------------------------------------------------------------------------------------------------------ */
diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index dcfcdc047..41de89794 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -225,7 +225,7 @@ bool initWifi()
 #if !MESHTASTIC_EXCLUDE_WEBSERVER
         createSSLCert(); // For WebServer
 #endif
-        esp_wifi_set_storage(WIFI_STORAGE_RAM); // Disable flash storage for WiFi credentials
+        WiFi.persistent(false); // Disable flash storage for WiFi credentials
 #endif
         if (!*wifiPsw) // Treat empty password as no password
             wifiPsw = NULL;
diff --git a/version.properties b/version.properties
index 4312ae59a..efc42428c 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 5
-build = 20
+build = 21