diff --git a/.github/workflows/buildroot.yml b/.github/workflows/buildroot.yml
deleted file mode 100644
index 93799e2c6..000000000
--- a/.github/workflows/buildroot.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Buildroot
-
-on: [push]
-
-jobs:
-
-    buildroot-armv7-build:
-        name: Build Armv7
-        runs-on: ubuntu-20.04
-        container: colemancda/swift-buildroot:amd64-prebuilt-armv7
-        steps:
-        - name: Checkout
-          uses: actions/checkout@v3
-        - name: Swift Version
-          run: swift --version
-        - name: Build
-          run: |
-            cd /usr/src/buildroot-external
-            export SWIFT_ARCH=armv7
-            export SWIFT_PACKAGE_PATH=$GITHUB_WORKSPACE
-            export SWIFTPM_DISABLE_PLUGINS=1
-            ./build-swift-package.sh
-        - name: Archive Build artifacts
-          uses: actions/upload-artifact@v3
-          with:
-            name: swiftpm-build-armv7
-            path: .build/*/*.xctest
diff --git a/.github/workflows/swift-arm.yml b/.github/workflows/swift-arm.yml
index de3f377a3..1325caa23 100644
--- a/.github/workflows/swift-arm.yml
+++ b/.github/workflows/swift-arm.yml
@@ -2,23 +2,18 @@ name: Swift ARM
 on: [push]
 jobs:
 
-    linux-armv7-crosscompile-build:
-        name: Crosscompile for Linux Armv7
-        runs-on: ubuntu-latest
-        container: colemancda/swift-armv7:latest-prebuilt
-        steps:
-        - name: Checkout
-          uses: actions/checkout@v3
-        - name: Swift Version
-          run: swift --version
-        - name: Build (Release)
-          run: |
-            cd $SRC_ROOT
-            export SWIFT_PACKAGE_SRCDIR=$GITHUB_WORKSPACE
-            export SWIFT_PACKAGE_BUILDDIR=$SWIFT_PACKAGE_SRCDIR/.build
-            $SRC_ROOT/build-swift-package.sh
-        - name: Archive Build artifacts
-          uses: actions/upload-artifact@v3
-          with:
-            name: linux-armv7-crosscompile-test
-            path: .build/*/*.xctest
+    macos:
+      name: Baremetal Embedded ARM 
+      runs-on: macos-latest
+      steps:
+      - name: Install Swift
+        uses: slashmo/install-swift@v0.3.0
+        with:
+          version: swift-DEVELOPMENT-SNAPSHOT-2024-10-30-a
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Swift Version
+        run: swift --version
+      - name: Build
+        run: swift build --triple armv6m-apple-none-macho --configuration release --verbose -Xswiftc -enable-experimental-feature -Xswiftc Embedded -Xswiftc -disable-stack-protector -Xcc -D__MACH__ -Xcc -ffreestanding -Xcc -mcpu=cortex-m0plus -Xcc -mthumb --target Bluetooth
+
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index 6063c4e07..4afb8ada2 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -9,7 +9,7 @@ jobs:
     - name: Install Swift
       uses: slashmo/install-swift@v0.3.0
       with:
-        version: 5.8
+        version: 6.0
     - name: Checkout
       uses: actions/checkout@v2
     - name: Swift Version
@@ -25,7 +25,7 @@ jobs:
     name: Linux
     strategy:
       matrix:
-        swift: [5.6.3, 5.7.3, 5.8]
+        swift: [5.9, 6.0]
     runs-on: ubuntu-20.04
     steps:
     - name: Install Swift