diff --git a/.github/workflows/cargo-build-and-test.yml b/.github/workflows/cargo-build-and-test.yml
index b96d35a..44172a9 100644
--- a/.github/workflows/cargo-build-and-test.yml
+++ b/.github/workflows/cargo-build-and-test.yml
@@ -13,12 +13,16 @@ jobs:
   build-test-linux:
     runs-on: ubuntu-latest
     timeout-minutes: 20
-    container:
-      image: rust:1-bullseye
     steps:
     - uses: actions/checkout@v2
+    - name: Install latest stable Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
     - name: Install dependencies
-      run: apt-get update -y && apt-get install cmake libhwloc-dev -y
+      run: sudo apt-get update -y && sudo apt-get install libhwloc-dev -y
     - name: Build
       run: |
         cargo build --verbose -p aquatic_udp --features "cpu-pinning"
@@ -28,10 +32,16 @@ jobs:
       run: cargo test --verbose --workspace --all-targets
 
 
-#  build-macos:
-#    runs-on: macos-latest
-#    timeout-minutes: 10
-#    steps:
-#    - uses: actions/checkout@v2
-#    - name: Build
-#      run: cargo build --verbose -p aquatic_udp
+  build-macos:
+    runs-on: macos-latest
+    timeout-minutes: 10
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install latest stable Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+    - name: Build
+      run: cargo build --verbose -p aquatic_udp