diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index edcdda7f8..c68d8e698 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -106,6 +106,7 @@ jobs:
           dbus-devel
           git
           glibc-static
+          jq
           libblkid-devel
           make
           python3-dbus-client-gen
@@ -116,27 +117,23 @@ jobs:
           python3-psutil
           python3-wcwidth
           systemd-devel
-          toml-cli
       - uses: stratis-storage/github-actions/github-modify@HEAD
         with:
           repo: stratisd
       - name: Print head commit
         run: git log --oneline -1
         working-directory: stratisd
-      - name: Get package MSRV
-        id: msrv
-        run: |
-          MSRV=$(toml get --toml-path Cargo.toml "workspace.package.rust-version")
-          echo "MSRV=$MSRV" >> "$GITHUB_OUTPUT"
-        working-directory: stratisd
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: cargo
-          toolchain: ${{ steps.msrv.outputs.MSRV }}
       - name: Overwrite stratisd dependencies as necessary
         uses: stratis-storage/github-actions/stratisd-modify@HEAD
         with:
           working-directory: stratisd
+      - name: Set toolchain to MSRV
+        uses: stratis-storage/github-actions/set-rust-toolchain@HEAD
+        with:
+          working-directory: stratisd
       - name: Build stratisd
         run: PROFILEDIR=debug make build-all-rust
         working-directory: stratisd
@@ -175,6 +172,7 @@ jobs:
           dbus-devel
           git
           glibc-static
+          jq
           libblkid-devel
           make
           python3-coverage
@@ -186,27 +184,23 @@ jobs:
           python3-psutil
           python3-wcwidth
           systemd-devel
-          toml-cli
       - uses: stratis-storage/github-actions/github-modify@HEAD
         with:
           repo: stratisd
       - name: Print head commit
         run: git log --oneline -1
         working-directory: stratisd
-      - name: Get package MSRV
-        id: msrv
-        run: |
-          MSRV=$(toml get --toml-path Cargo.toml "workspace.package.rust-version")
-          echo "MSRV=$MSRV" >> "$GITHUB_OUTPUT"
-        working-directory: stratisd
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: cargo
-          toolchain: ${{ steps.msrv.outputs.MSRV }}
       - name: Overwrite stratisd dependencies as necessary
         uses: stratis-storage/github-actions/stratisd-modify@HEAD
         with:
           working-directory: stratisd
+      - name: Set toolchain to MSRV
+        uses: stratis-storage/github-actions/set-rust-toolchain@HEAD
+        with:
+          working-directory: stratisd
       - name: Build stratisd
         run: PROFILEDIR=debug make build-all-rust
         working-directory: stratisd