diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3330d9d7..caaffef1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,21 +15,16 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
 
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          override: true
-          components: rustfmt, clippy
-
       - name: Cache ~/.cargo/bin directory
-        uses: actions/cache@v1
+        id: cargo-bin-cache
+        uses: actions/cache@v2.1.4
         with:
           path: ~/.cargo/bin
-          key: ubuntu-rust-${{ env.RUST_TOOLCHAIN }}-cargo-bin-directory-v1
+          key: ubuntu-rust-${{ hashFiles('rust-toolchain') }}-cargo-bin-directory-v1
 
       - name: Install tomlfmt
-        run: which cargo-tomlfmt || cargo install cargo-tomlfmt
+        if: steps.cargo-bin-cache.outputs.cache-hit != 'true'
+        run: cargo install cargo-tomlfmt
 
       - name: Check Cargo.toml formatting
         run: |
@@ -46,7 +41,46 @@ jobs:
       - name: Run clippy with all features enabled
         run: cargo clippy --workspace --all-targets --all-features -- -D warnings
 
-  build_test:
+  build:
+    strategy:
+      matrix:
+        target: [ x86_64-unknown-linux-gnu, x86_64-apple-darwin ]
+        include:
+          - target: x86_64-unknown-linux-gnu
+            os: ubuntu-latest
+          - target: x86_64-apple-darwin
+            os: macos-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Cache target and registry directory
+        uses: actions/cache@v2.1.4
+        with:
+          path: |
+            target
+            ~/.cargo/registry
+          key: rust-${{ matrix.target }}-build-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('rust-toolchain') }}-v1
+
+      - name: Build binary
+        run: |
+          cargo build -p swap --target ${{ matrix.target }}
+
+      - name: Upload swap_cli binary
+        uses: actions/upload-artifact@v2-preview
+        with:
+          name: swap-${{ matrix.target }}
+          path: target/${{ matrix.target }}/debug/swap_cli
+
+      - name: Upload nectar binary
+        uses: actions/upload-artifact@v2-preview
+        with:
+          name: nectar-${{ matrix.target }}
+          path: target/${{ matrix.target }}/debug/nectar
+
+  test:
     env:
       RUST_TEST_TASKS: 2
     strategy:
@@ -57,37 +91,19 @@ jobs:
             os: ubuntu-latest
           - target: x86_64-apple-darwin
             os: macos-latest
-            skip_tests: true # Most likely do not work due to docker usage, TODO: add feature flag to allow unit tests
     runs-on: ${{ matrix.os }}
     steps:
 
       - name: Checkout sources
         uses: actions/checkout@v2
 
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+      - name: Cache target and registry directory
+        uses: actions/cache@v2.1.4
         with:
-          profile: minimal
-          override: true
-
-      - name: Cache target directory
-        uses: actions/cache@v1
-        if: matrix.os == 'ubuntu-latest'
-        with:
-          path: target
-          key: rust-${{ matrix.target }}-target-directory-${{ hashFiles('Cargo.lock') }}-v1
-
-      - name: Cache ~/.cargo/registry directory
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/registry
-          key: rust-${{ matrix.target }}-cargo-registry-directory-${{ hashFiles('Cargo.lock') }}-v1
-
-      - name: Cargo check release code with default features
-        run: cargo check --workspace
-
-      - name: Cargo check all features
-        run: cargo check --workspace --all-targets --all-features
+          path: |
+            target
+            ~/.cargo/registry
+          key: rust-${{ matrix.target }}-test-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('rust-toolchain') }}-v1
 
       - name: Build tests
         run: cargo build --tests --workspace --all-features
@@ -99,16 +115,6 @@ jobs:
       - name: Run library tests for swap
         run: cargo test --package swap --lib --all-features
 
-      - name: Build binary
-        run: |
-          cargo build -p swap --target ${{ matrix.target }}
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v2-preview
-        with:
-          name: swap-${{ matrix.target }}
-          path: target/${{ matrix.target }}/debug/swap
-
   docker_tests:
     env:
       TARGET: x86_64-unknown-linux-gnu
@@ -127,23 +133,13 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
 
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+      - name: Cache target and registry directory
+        uses: actions/cache@v2.1.4
         with:
-          profile: minimal
-          override: true
-
-      - name: Cache target directory
-        uses: actions/cache@v1
-        with:
-          path: target
-          key: rust-${{ env.TARGET }}-target-directory-${{ hashFiles('Cargo.lock') }}-v1
-
-      - name: Cache ~/.cargo/registry directory
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/registry
-          key: rust-${{ env.TARGET }}-cargo-registry-directory-${{ hashFiles('Cargo.lock') }}-v1
+          path: |
+            target
+            ~/.cargo/registry
+          key: rust-${{ matrix.target }}-test-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('rust-toolchain') }}-v1
 
       - name: Run test ${{ matrix.test_name }}
         run: cargo test --package swap --all-features --test ${{ matrix.test_name }} ""
diff --git a/bors.toml b/bors.toml
index fcb4f9eb..8f1b1ab7 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,7 +1,9 @@
 status = [
     "static_analysis",
-    "build_test (x86_64-unknown-linux-gnu)",
-    "build_test (x86_64-apple-darwin)",
+    "build (x86_64-unknown-linux-gnu)",
+    "build (x86_64-apple-darwin)",
+    "test (x86_64-unknown-linux-gnu)",
+    "test (x86_64-apple-darwin)",
     "docker_tests (happy_path)",
     "docker_tests (happy_path_restart_bob_before_comm)",
     "docker_tests (bob_refunds_using_cancel_and_refund_command)",
diff --git a/rust-toolchain b/rust-toolchain
index 97e6da5f..b431082c 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1,3 @@
-nightly-2021-01-31
+[toolchain]
+channel = "nightly-2021-01-31"
+components = ["rustfmt", "clippy"]