diff --git a/main/x86_64/index.json b/main/x86_64/index.json
index b916c79..49b487e 100644
--- a/main/x86_64/index.json
+++ b/main/x86_64/index.json
@@ -1 +1 @@
-{"architecture": "x86_64", "packages":{"libyder": "1.4.17-r1", "meshtasticd": "2.5.17-r8", "meshtasticd-avahi-service": "2.5.17-r8", "meshtasticd-web": "2.5.4-r1", "protobuf": "29.1-r1", "protobuf-lite": "29.1-r1", "python3-dotmap": "1.3.30-r1", "python3-meshtastic": "2.5.7-r1", "python3-print-color": "0.4.6-r1", "python3-protobuf": "5.29.1-r1", "python3-pypubsub": "4.0.3-r1", "python3-pyqrcode": "1.2.1-r1"}}
+{"architecture": "x86_64", "packages":{"libyder": "1.4.17-r1", "meshtasticd": "2.5.18-r1", "meshtasticd-avahi-service": "2.5.18-r1", "meshtasticd-web": "2.5.4-r1", "protobuf": "29.1-r1", "protobuf-lite": "29.1-r1", "python3-dotmap": "1.3.30-r1", "python3-meshtastic": "2.5.7-r1", "python3-print-color": "0.4.6-r1", "python3-protobuf": "5.29.1-r1", "python3-pypubsub": "4.0.3-r1", "python3-pyqrcode": "1.2.1-r1"}}
diff --git a/main/x86_64/libyder-1.4.17-r1.apk b/main/x86_64/libyder-1.4.17-r1.apk
index c92f447..635afc8 100644
Binary files a/main/x86_64/libyder-1.4.17-r1.apk and b/main/x86_64/libyder-1.4.17-r1.apk differ
diff --git a/main/x86_64/meshtasticd-2.5.17-r8.apk b/main/x86_64/meshtasticd-2.5.17-r8.apk
deleted file mode 100644
index a39486d..0000000
Binary files a/main/x86_64/meshtasticd-2.5.17-r8.apk and /dev/null differ
diff --git a/main/x86_64/meshtasticd-2.5.18-r1.apk b/main/x86_64/meshtasticd-2.5.18-r1.apk
new file mode 100644
index 0000000..b0811a2
Binary files /dev/null and b/main/x86_64/meshtasticd-2.5.18-r1.apk differ
diff --git a/main/x86_64/meshtasticd-avahi-service-2.5.17-r8.apk b/main/x86_64/meshtasticd-avahi-service-2.5.17-r8.apk
deleted file mode 100644
index 22e510a..0000000
Binary files a/main/x86_64/meshtasticd-avahi-service-2.5.17-r8.apk and /dev/null differ
diff --git a/main/x86_64/meshtasticd-avahi-service-2.5.18-r1.apk b/main/x86_64/meshtasticd-avahi-service-2.5.18-r1.apk
new file mode 100644
index 0000000..bb5bb8f
Binary files /dev/null and b/main/x86_64/meshtasticd-avahi-service-2.5.18-r1.apk differ
diff --git a/main/x86_64/meshtasticd-web-2.5.4-r1.apk b/main/x86_64/meshtasticd-web-2.5.4-r1.apk
index 475e32e..aa7b044 100644
Binary files a/main/x86_64/meshtasticd-web-2.5.4-r1.apk and b/main/x86_64/meshtasticd-web-2.5.4-r1.apk differ
diff --git a/main/x86_64/packages.adb b/main/x86_64/packages.adb
index 3cd52ec..188451a 100644
Binary files a/main/x86_64/packages.adb and b/main/x86_64/packages.adb differ
diff --git a/main/x86_64/protobuf-29.1-r1.apk b/main/x86_64/protobuf-29.1-r1.apk
index 244ab4e..e244afd 100644
Binary files a/main/x86_64/protobuf-29.1-r1.apk and b/main/x86_64/protobuf-29.1-r1.apk differ
diff --git a/main/x86_64/protobuf-lite-29.1-r1.apk b/main/x86_64/protobuf-lite-29.1-r1.apk
index 5d776eb..5b6bbd7 100644
Binary files a/main/x86_64/protobuf-lite-29.1-r1.apk and b/main/x86_64/protobuf-lite-29.1-r1.apk differ
diff --git a/main/x86_64/python3-dotmap-1.3.30-r1.apk b/main/x86_64/python3-dotmap-1.3.30-r1.apk
index b4adc6a..b9987b9 100644
Binary files a/main/x86_64/python3-dotmap-1.3.30-r1.apk and b/main/x86_64/python3-dotmap-1.3.30-r1.apk differ
diff --git a/main/x86_64/python3-meshtastic-2.5.7-r1.apk b/main/x86_64/python3-meshtastic-2.5.7-r1.apk
index 5ac1a1c..93a9441 100644
Binary files a/main/x86_64/python3-meshtastic-2.5.7-r1.apk and b/main/x86_64/python3-meshtastic-2.5.7-r1.apk differ
diff --git a/main/x86_64/python3-print-color-0.4.6-r1.apk b/main/x86_64/python3-print-color-0.4.6-r1.apk
index 9b48995..5a58fd8 100644
Binary files a/main/x86_64/python3-print-color-0.4.6-r1.apk and b/main/x86_64/python3-print-color-0.4.6-r1.apk differ
diff --git a/main/x86_64/python3-protobuf-5.29.1-r1.apk b/main/x86_64/python3-protobuf-5.29.1-r1.apk
index 85a55ab..e2bb3d3 100644
Binary files a/main/x86_64/python3-protobuf-5.29.1-r1.apk and b/main/x86_64/python3-protobuf-5.29.1-r1.apk differ
diff --git a/main/x86_64/python3-pypubsub-4.0.3-r1.apk b/main/x86_64/python3-pypubsub-4.0.3-r1.apk
index 769371f..1dcb530 100644
Binary files a/main/x86_64/python3-pypubsub-4.0.3-r1.apk and b/main/x86_64/python3-pypubsub-4.0.3-r1.apk differ
diff --git a/main/x86_64/python3-pyqrcode-1.2.1-r1.apk b/main/x86_64/python3-pyqrcode-1.2.1-r1.apk
index 9e2ee53..955cc68 100644
Binary files a/main/x86_64/python3-pyqrcode-1.2.1-r1.apk and b/main/x86_64/python3-pyqrcode-1.2.1-r1.apk differ