diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml
index c7db60e201..f174e1b131 100644
--- a/.github/workflows/nightly_build.yml
+++ b/.github/workflows/nightly_build.yml
@@ -1,4 +1,4 @@
-name: Nightly builds
+name: nightly-build
 
 on:
   workflow_dispatch:
@@ -25,14 +25,14 @@ jobs:
     continue-on-error: ${{ matrix.rust == 'beta' || matrix.rust == 'stable' }}
     steps:
       - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
+        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler
         continue-on-error: true
-        if: matrix.os == 'custom-linux'
+        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'custom-linux'
 
       - name: Check out repository code
         uses: actions/checkout@v3
 
-      - name: Install rust toolchain
+      - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -52,11 +52,11 @@ jobs:
           command: build
           args: --workspace
 
-      - name: Reclaim some disk space
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'custom-linux' }}
-        with:
-          command: clean
+      # - name: Reclaim some disk space
+      #   uses: actions-rs/cargo@v1
+      #   if: ${{ matrix.os == 'windows-latest' || matrix.os == 'custom-linux' }}
+      #   with:
+      #     command: clean
 
       - name: Build all examples
         uses: actions-rs/cargo@v1
@@ -64,56 +64,37 @@ jobs:
           command: build
           args: --workspace --examples
 
-      - name: Reclaim some disk space
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'custom-linux' }}
-        with:
-          command: clean
+      # - name: Reclaim some disk space
+      #   uses: actions-rs/cargo@v1
+      #   if: ${{ matrix.os == 'windows-latest' || matrix.os == 'custom-linux' }}
+      #   with:
+      #     command: clean
 
-      - name: Run all tests
+      - name: Run all tests (incl. expensive)
         uses: actions-rs/cargo@v1
         with:
           command: test
           args: --workspace
+          #args: --workspace -- --ignored
 
-      - name: Reclaim some disk space
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'custom-linux' }}
-        with:
-          command: clean
-
-      - name: Run expensive tests
-        if: github.ref == 'refs/heads/develop' || github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'master'
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace -- --ignored
-
-      - name: Reclaim some disk space
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'custom-linux' }}
-        with:
-          command: clean
-
-      - uses: actions-rs/clippy-check@v1
-        name: Clippy checks
-        continue-on-error: true
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --workspace
+      # - name: Reclaim some disk space
+      #   uses: actions-rs/cargo@v1
+      #   if: ${{ matrix.os == 'windows-latest' || matrix.os == 'custom-linux' }}
+      #   with:
+      #     command: clean
 
       - name: Run clippy
         uses: actions-rs/cargo@v1
-        if: ${{ matrix.rust != 'nightly' }}
+        # if: ${{ matrix.rust != 'nightly' }}
         with:
           command: clippy
           args: --workspace --all-targets -- -D warnings
 
-      - name: Reclaim some disk space
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'custom-linux' }}
-        with:
-          command: clean
+      # - name: Reclaim some disk space
+      #   uses: actions-rs/cargo@v1
+      #   if: ${{ matrix.os == 'windows-latest' || matrix.os == 'custom-linux' }}
+      #   with:
+      #     command: clean
 
   notification:
     needs: build
diff --git a/.github/workflows/nightly_build_matrix_includes.json b/.github/workflows/nightly_build_matrix_includes.json
index a9c45ae5c9..4e3bc825fb 100644
--- a/.github/workflows/nightly_build_matrix_includes.json
+++ b/.github/workflows/nightly_build_matrix_includes.json
@@ -5,7 +5,7 @@
     "runOnEvent":"schedule"
   },
   {
-    "os":"custom-linux",
+    "os":"ubuntu-20.04",
     "rust":"stable",
     "runOnEvent":"workflow_dispatch"
   },
@@ -15,11 +15,22 @@
     "rust":"stable",
     "runOnEvent":"schedule"
   },
+  {
+    "os":"windows10",
+    "rust":"stable",
+    "runOnEvent":"workflow_dispatch"
+  },
+
   {
     "os":"custom-runner-mac-m1",
     "rust":"stable",
     "runOnEvent":"schedule"
   },
+  {
+    "os":"custom-runner-mac-m1",
+    "rust":"stable",
+    "runOnEvent":"workflow_dispatch"
+  },
 
   {
     "os":"custom-linux",