diff --git a/.github/workflows/multi-arch-build.yml b/.github/workflows/multi-arch-build.yml
index b26379e..30db766 100644
--- a/.github/workflows/multi-arch-build.yml
+++ b/.github/workflows/multi-arch-build.yml
@@ -17,8 +17,13 @@ jobs:
   build:
     name: build ${{ matrix.arch }} ${{ github.ref_name }}
     runs-on: ubuntu-24.04
+    concurrency:
+      # Only run one build at a time (in case of multiple merges)
+      group: publish-builds
     strategy:
       fail-fast: false
+      # We can only run one build at a time due to the GitHub Pages deployment
+      # This should be revisited in the future, as it makes the build take *days*
       max-parallel: 1
       matrix:
         arch:
@@ -88,3 +93,4 @@ jobs:
           destination_dir: ${{ github.ref_name }}/${{ matrix.arch }}
           user_name: 'github-actions[bot]'
           user_email: 'github-actions[bot]@users.noreply.github.com'
+          enable_jekyll: true
diff --git a/meshtasticd/Makefile b/meshtasticd/Makefile
index b670d68..1e6cc12 100644
--- a/meshtasticd/Makefile
+++ b/meshtasticd/Makefile
@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=meshtasticd
 PKG_VERSION:=2.5.18
-PKG_RELEASE:=1
-PKG_SOURCE_VERSION:=b12ac6d564be4558047231d5ad946a908dfbbd7f
+PKG_RELEASE:=2
+PKG_SOURCE_VERSION:=v2.5.18.89ebafc
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/meshtastic/firmware.git
-PKG_MIRROR_HASH:=4f1428b62564e77cd14c52fef1152a2bdd85d8fa016b12fba769207bcb9c4b46
+PKG_MIRROR_HASH:=86c3da17fdc95ec9bdb792e6562ca8a726632a32e996b24c428977a6f6233280
 PKG_BUILD_DEPENDS:= \
 	python3/host \
 	python-platformio/host \
@@ -122,13 +122,13 @@ define Package/meshtasticd/install
 	$(CP) -R $(PKG_BUILD_DIR)/bin/config.d/* $(1)/etc/meshtasticd/available.d
 
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/var/lib/meshtasticd
+	$(INSTALL_DIR) $(1)/srv/meshtasticd
 	$(INSTALL_BIN) ./files/meshtasticd.init $(1)/etc/init.d/meshtasticd
 endef
 
 define Package/meshtasticd-avahi-service/install
 	$(INSTALL_DIR) $(1)/etc/avahi/services
-	$(INSTALL_DATA) ./files/meshtasticd.service $(1)/etc/avahi/services/
+	$(INSTALL_CONF) ./files/meshtasticd.service $(1)/etc/avahi/services/
 endef
 
 define Package/meshtasticd/conffiles
diff --git a/meshtasticd/files/meshtasticd.init b/meshtasticd/files/meshtasticd.init
index 84faa9a..bd24c01 100644
--- a/meshtasticd/files/meshtasticd.init
+++ b/meshtasticd/files/meshtasticd.init
@@ -6,7 +6,7 @@ USE_PROCD=1
 
 NAME=meshtasticd
 DAEMON=/usr/sbin/meshtasticd
-DATA_DIR=/var/lib/meshtasticd
+DATA_DIR=/srv/meshtasticd
 
 CONFIG_BASEDIR=/etc/config/meshtasticd
 CONFIG_FILE=${CONFIG_BASEDIR}/config.yaml
diff --git a/python-meshtastic/Makefile b/python-meshtastic/Makefile
index 1eb12eb..45cd1d8 100644
--- a/python-meshtastic/Makefile
+++ b/python-meshtastic/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-meshtastic
-PKG_VERSION:=2.5.7
+PKG_VERSION:=2.5.9
 PKG_RELEASE:=1
 
 PYPI_NAME:=meshtastic
-PKG_HASH:=45e43e192e3a5467dd31f86a378efe4160efde1fdec29af91dc61ed369e33c5d
+PKG_HASH:=e0d90f18446605c232ad40d6903ffa6bce427d5c278443d254740a4bb2c8630c
 
 PKG_MAINTAINER:=Austin Lane <vidplace7@gmail.com>
 PKG_LICENSE:=GPL-3.0