diff --git a/.github/workflows/package_amd64.yml b/.github/workflows/package_amd64.yml
index ae7bf3242..0b5093f24 100644
--- a/.github/workflows/package_amd64.yml
+++ b/.github/workflows/package_amd64.yml
@@ -13,7 +13,7 @@ jobs:
     uses: ./.github/workflows/build_native.yml
 
   package-native:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build-native
     steps:
       - name: Checkout code
diff --git a/.github/workflows/package_raspbian.yml b/.github/workflows/package_raspbian.yml
index 5471332c5..bcbda53e2 100644
--- a/.github/workflows/package_raspbian.yml
+++ b/.github/workflows/package_raspbian.yml
@@ -13,7 +13,7 @@ jobs:
     uses: ./.github/workflows/build_raspbian.yml
 
   package-raspbian:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build-raspbian
     steps:
       - name: Checkout code
diff --git a/.github/workflows/package_raspbian_armv7l.yml b/.github/workflows/package_raspbian_armv7l.yml
index 5b9c9aa71..1308fe925 100644
--- a/.github/workflows/package_raspbian_armv7l.yml
+++ b/.github/workflows/package_raspbian_armv7l.yml
@@ -13,7 +13,7 @@ jobs:
     uses: ./.github/workflows/build_raspbian_armv7l.yml
 
   package-raspbian_armv7l:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build-raspbian_armv7l
     steps:
       - name: Checkout code
diff --git a/.github/workflows/sec_sast_semgrep_pull.yml b/.github/workflows/sec_sast_semgrep_pull.yml
index b6c288494..2575cbf01 100644
--- a/.github/workflows/sec_sast_semgrep_pull.yml
+++ b/.github/workflows/sec_sast_semgrep_pull.yml
@@ -4,7 +4,7 @@ on: pull_request
 
 jobs:
   semgrep-diff:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
       image: returntocorp/semgrep
 
diff --git a/boards/heltec_mesh_node_t114.json b/boards/heltec_mesh_node_t114.json
index 5c97d8c75..2bd306eb9 100644
--- a/boards/heltec_mesh_node_t114.json
+++ b/boards/heltec_mesh_node_t114.json
@@ -5,7 +5,7 @@
     },
     "core": "nRF5",
     "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_PCA10056 -DNRF52840_XXAA",
+    "extra_flags": "-DHELTEC_T114 -DNRF52840_XXAA",
     "f_cpu": "64000000L",
     "hwids": [
       ["0x239A", "0x4405"],
diff --git a/boards/me25ls01-4y10td.json b/boards/me25ls01-4y10td.json
index 46c526a7c..9e1d63265 100644
--- a/boards/me25ls01-4y10td.json
+++ b/boards/me25ls01-4y10td.json
@@ -5,7 +5,7 @@
     },
     "core": "nRF5",
     "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA",
+    "extra_flags": "-DME25LS01_4Y10TD -DNRF52840_XXAA",
     "f_cpu": "64000000L",
     "hwids": [
       ["0x239A", "0x8029"],
diff --git a/boards/ms24sf1.json b/boards/ms24sf1.json
index 4e28507da..8356e3012 100644
--- a/boards/ms24sf1.json
+++ b/boards/ms24sf1.json
@@ -5,7 +5,7 @@
     },
     "core": "nRF5",
     "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA",
+    "extra_flags": "-DMS24SF1 -DNRF52840_XXAA",
     "f_cpu": "64000000L",
     "hwids": [
       ["0x239A", "0x8029"],
diff --git a/boards/nordic_pca10059.json b/boards/nordic_pca10059.json
index b99e3c763..6540817a2 100644
--- a/boards/nordic_pca10059.json
+++ b/boards/nordic_pca10059.json
@@ -5,7 +5,7 @@
     },
     "core": "nRF5",
     "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
+    "extra_flags": "-DNORDIC_PCA10059 -DNRF52840_XXAA",
     "f_cpu": "64000000L",
     "hwids": [
       ["0x239A", "0x8029"],
diff --git a/platformio.ini b/platformio.ini
index d561aaf74..9b869a036 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -88,8 +88,7 @@ monitor_speed = 115200
 monitor_filters = direct
 
 lib_deps =
-;  jgromes/RadioLib@~6.6.0
-  https://github.com/jgromes/RadioLib.git#3115fc2d6700a9aee05888791ac930a910f2628f
+  jgromes/RadioLib@~7.0.0
   https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95 ; ESP8266_SSD1306
   https://github.com/mathertel/OneButton@~2.6.1 ; OneButton library for non-blocking button debounce
   https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
@@ -157,9 +156,9 @@ lib_deps =
   https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
   boschsensortec/BME68x Sensor Library@^1.1.40407
   https://github.com/KodinLanewave/INA3221@^1.0.0
-  lewisxhe/SensorLib@^0.2.0
+  lewisxhe/SensorLib@0.2.0
   mprograms/QMC5883LCompass@^1.2.0
   
 
   https://github.com/meshtastic/DFRobot_LarkWeatherStation#dee914270dc7cb3e43fbf034edd85a63a16a12ee
-  https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1
\ No newline at end of file
+  https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1