diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
index 1a5b4af98a..9682476923 100644
--- a/.github/workflows/cargo.yml
+++ b/.github/workflows/cargo.yml
@@ -5,13 +5,13 @@ name: stratisd cargo CI
 on:
   push:
     branches:
-      - master
+      - patch-3.6.0
     paths:
       - '**/Cargo.toml'
       - '.github/workflows/cargo.yml'
   pull_request:
     branches:
-      - master
+      - patch-3.6.0
     paths:
       - '**/Cargo.toml'
       - '.github/workflows/cargo.yml'
diff --git a/.github/workflows/dummy.yml b/.github/workflows/dummy.yml
index e6ebfb3a3e..7ac520d669 100644
--- a/.github/workflows/dummy.yml
+++ b/.github/workflows/dummy.yml
@@ -5,10 +5,10 @@ name: stratisd dummy CI
 on:
   push:
     branches:
-      - master
+      - patch-3.6.0
   pull_request:
     branches:
-      - master
+      - patch-3.6.0
 
   workflow_dispatch:
 
diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
index bdb99392a7..c0042703e4 100644
--- a/.github/workflows/fedora.yml
+++ b/.github/workflows/fedora.yml
@@ -5,7 +5,7 @@ name: stratisd CI on fedora
 on:
   push:
     branches:
-      - master
+      - patch-3.6.0
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'
@@ -16,7 +16,7 @@ on:
       - 'test/**'
   pull_request:
     branches:
-      - master
+      - patch-3.6.0
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 681864d347..6e7e2ff937 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ name: stratisd CI
 on:
   push:
     branches:
-      - master
+      - patch-3.6.0
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'
@@ -16,7 +16,7 @@ on:
       - 'test/**'
   pull_request:
     branches:
-      - master
+      - patch-3.6.0
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'
@@ -170,6 +170,9 @@ jobs:
         run: cp stratisd.conf /usr/share/dbus-1/system.d
       - name: Check out stratis-cli
         run: git clone https://github.com/stratis-storage/stratis-cli.git
+      - name: Use stratis-cli 3.6.0
+        run: git checkout tags/v3.6.0 -b version-3.6.0
+        working-directory: ./stratis-cli
       - name: Run stratis-cli tests
         run: >
           RUST_LOG=stratisd=debug
@@ -280,10 +283,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - rev: HEAD
+          - rev: v3.6.0
             args: --log-level=debug stratisd_cert --verify-devices --monitor-dbus --highest-revision-number=6
-          - rev: v3.5.2
-            args: stratisd_cert --verify-devices
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
deleted file mode 100644
index cf67e99d75..0000000000
--- a/.github/workflows/nightly.yml
+++ /dev/null
@@ -1,321 +0,0 @@
----
-name: stratisd nightly
-
-# yamllint disable-line rule:truthy
-on:
-  schedule:
-    - cron: 15 3 * * *
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  jobs:
-    strategy:
-      matrix:
-        include:
-          - task: cargo package
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-            components: cargo
-    runs-on: ubuntu-22.04
-    container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          clang
-          curl
-          cryptsetup-devel
-          dbus-devel
-          device-mapper-devel
-          libblkid-devel
-          make
-          ncurses
-          openssl-devel
-          python-requests
-          python-semantic_version
-          systemd-devel
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: ${{ matrix.components }}
-          toolchain: ${{ matrix.toolchain }}
-      - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
-        run: ${{ matrix.task }}
-
-  check_future_dependencies:
-    runs-on: ubuntu-22.04
-    container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          clang
-          curl
-          cryptsetup-devel
-          dbus-devel
-          libblkid-devel
-          make
-          ncurses
-          openssl-devel
-          systemd-devel
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: cargo, clippy
-          toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-      - uses: baptiste0928/cargo-install@v2
-        with:
-          crate: cargo-audit
-      - name: Run cargo-update
-        run: cargo update
-      - name: Run cargo-clippy
-        run: make -f Makefile clippy
-      - name: Run cargo-audit
-        run: make -f Makefile audit
-
-  allowed_failures:
-    continue-on-error: true
-    strategy:
-      matrix:
-        include:
-          # Allowed because a failure may occur after a new Rust stable
-          # version is released.
-          - task: make -f Makefile clippy
-            toolchain: stable
-            components: clippy
-    runs-on: ubuntu-22.04
-    container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          clang
-          curl
-          cryptsetup-devel
-          dbus-devel
-          libblkid-devel
-          make
-          ncurses
-          openssl-devel
-          python-requests
-          python-semantic_version
-          systemd-devel
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: ${{ matrix.components }}
-          toolchain: ${{ matrix.toolchain }}
-      - uses: baptiste0928/cargo-install@v2
-        with:
-          crate: cargo-audit
-      - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
-        run: ${{ matrix.task }}
-
-  cargo-audit-checks:
-    continue-on-error: true
-    strategy:
-      matrix:
-        include:
-          - task: make -f Makefile audit
-          - task: AUDITABLE=1 PROFILEDIR=debug make -f Makefile audit-all-rust
-    runs-on: ubuntu-22.04
-    container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          clang
-          curl
-          cryptsetup-devel
-          dbus-devel
-          glibc-static
-          libblkid-devel
-          make
-          ncurses
-          openssl-devel
-          python-requests
-          python-semantic_version
-          systemd-devel
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: cargo
-          toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-      - uses: baptiste0928/cargo-install@v2
-        with:
-          crate: cargo-audit
-      - uses: baptiste0928/cargo-install@v2
-        with:
-          crate: cargo-auditable
-      - name: Run matrix task
-        run: ${{ matrix.task }}
-
-  checks-with-ci-repo:
-    runs-on: ubuntu-22.04
-    container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          clang
-          curl
-          cryptsetup-devel
-          dbus-devel
-          device-mapper-devel
-          git
-          libblkid-devel
-          make
-          ncurses
-          openssl-devel
-          python-requests
-          python-semantic_version
-          systemd-devel
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: cargo
-          toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-      - name: Check out ci repo
-        run: git clone https://github.com/stratis-storage/ci.git
-      - name: Run comparisons of version specs with available Fedora packages
-        # yamllint disable rule:line-length
-        run: |
-          COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
-          COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
-          COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f37 IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions
-
-  legacy-cli-checks:
-    continue-on-error: true
-    strategy:
-      matrix:
-        include:
-          - image: fedora:36  # PINNED DEVELOPMENT ENVIRONMENT
-            tag: v3.4.1
-          - image: fedora:36  # PINNED DEVELOPMENT ENVIRONMENT
-            tag: v3.4.0
-          - image: fedora:36  # PINNED DEVELOPMENT ENVIRONMENT
-            tag: v3.3.0
-          - image: fedora:35  # PINNED DEVELOPMENT ENVIRONMENT
-            tag: v3.2.0
-          - image: fedora:35  # PINNED DEVELOPMENT ENVIRONMENT
-            tag: v3.1.0
-          - image: fedora:35  # PINNED DEVELOPMENT ENVIRONMENT
-            tag: v3.0.0
-          - image: fedora:35  # PINNED DEVELOPMENT ENVIRONMENT
-            tag: v3.0.1
-    runs-on: ubuntu-22.04
-    container:
-      image: ${{ matrix.image }}
-      options: --privileged --userns=host --ipc=host -v /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro -v /usr/share/dbus-1:/usr/share/dbus-1
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          asciidoc
-          clang
-          cryptsetup-devel
-          dbus-devel
-          device-mapper-devel
-          libblkid-devel
-          git
-          glibc-static
-          make
-          ncurses
-          python3-coverage
-          python3-dbus-client-gen
-          python3-dbus-python-client-gen
-          python3-justbytes
-          python3-dateutil
-          python3-packaging
-          python3-psutil
-          python3-wcwidth
-          systemd-devel
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: cargo
-          toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-      - name: Build stratisd
-        run: PROFILEDIR=debug make -f Makefile build-all
-      - name: Install stratisd
-        run: PROFILEDIR=debug make -f Makefile install
-      - name: Workaround for dbus inotify
-        run: cp stratisd.conf /usr/share/dbus-1/system.d
-      - name: Check out stratis-cli
-        run: git clone https://github.com/stratis-storage/stratis-cli.git
-      - name: Checkout tag
-        run: git checkout tags/${{ matrix.tag }} -b ${{ matrix.tag }}
-        working-directory: ./stratis-cli
-      - name: Run stratis-cli tests
-        run: >
-          RUST_LOG=stratisd=debug
-          STRATISD=/usr/libexec/stratisd
-          STRATIS_SKIP_UNSTABLE_TEST=1
-          PYTHONPATH=./src
-          make dbus-tests
-        working-directory: ./stratis-cli
-
-  python-based-tests:
-    strategy:
-      matrix:
-        include:
-          - toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-          - toolchain: 1.71.1  # LOWEST SUPPORTED RUST TOOLCHAIN
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Run apt-get update
-        run: sudo apt-get -q update
-      - name: Install dependencies
-        run: >
-          DEBIAN_FRONTEND=noninteractive
-          sudo apt-get install -y
-          asciidoc
-          clang
-          curl
-          libblkid-dev
-          libcryptsetup-dev
-          libdbus-1-dev
-          libdevmapper-dev
-          libsystemd-dev
-          libudev-dev
-          make
-          thin-provisioning-tools
-          udev
-          xfsprogs
-      - name: Install Python dependencies
-        run: >
-          sudo python -m pip install
-          dbus-python
-          dbus-client-gen
-          dbus-python-client-gen
-          justbytes
-          psutil
-          pyudev
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: cargo
-          toolchain: ${{ matrix.toolchain }}
-      - name: Build stratisd
-        run: PROFILEDIR=debug make -f Makefile build-all
-      - name: Install stratisd
-        run: sudo make PROFILEDIR=debug -f Makefile install
-      - name: Workaround for dbus inotify
-        run: sudo cp stratisd.conf /usr/share/dbus-1/system.d
-      - name: Reload udev
-        run: sudo udevadm control --reload
-      - name: Tests using Rust ${{ matrix.toolchain }}
-        run: >
-          sudo make
-          RUST_LOG=stratisd=debug
-          STRATISD=/usr/libexec/stratisd
-          STRATIS_PREDICT_USAGE=/usr/bin/stratis-predict-usage
-          PYTHONPATH=./src
-          predict-tests
-        working-directory: ./tests/client-dbus
diff --git a/.github/workflows/support.yml b/.github/workflows/support.yml
index 4d49d5aa21..f40009bd9d 100644
--- a/.github/workflows/support.yml
+++ b/.github/workflows/support.yml
@@ -6,14 +6,14 @@ name: stratisd support CI
 on:
   push:
     branches:
-      - master
+      - patch-3.6.0
     paths:
       - "**/*.yml"
       - "tests/**"
       - "!tests/**/README.*"
   pull_request:
     branches:
-      - master
+      - patch-3.6.0
     paths:
       - "**/*.yml"
       - "tests/**"
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 92432eec4c..57778d63fd 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -5,7 +5,7 @@ name: stratisd CI on ubuntu
 on:
   push:
     branches:
-      - master
+      - patch-3.6.0
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'
@@ -16,7 +16,7 @@ on:
       - 'test/**'
   pull_request:
     branches:
-      - master
+      - patch-3.6.0
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'
diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
deleted file mode 100644
index b3f6397c27..0000000000
--- a/.github/workflows/valgrind.yml
+++ /dev/null
@@ -1,275 +0,0 @@
----
-name: valgrind checks
-
-# yamllint disable-line rule:truthy
-on:
-  schedule:
-    - cron: 15 3 * * *
-
-  workflow_dispatch:
-
-# cancel the in-progress workflow when PR is refreshed.
-# yamllint disable rule:line-length
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-  checks:
-    strategy:
-      matrix:
-        include:
-          - task: make -f Makefile test-valgrind
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-            components: cargo
-          - task: >-
-              TANG_URL=localhost
-              make -f Makefile test-clevis-loop-should-fail-valgrind
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-            components: cargo
-    runs-on: ubuntu-22.04
-    container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
-      options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          clang
-          curl
-          cryptsetup-devel
-          dbus-devel
-          device-mapper-persistent-data
-          jq
-          libblkid-devel
-          make
-          sudo
-          systemd-devel
-          valgrind
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: ${{ matrix.components }}
-          toolchain: ${{ matrix.toolchain }}
-      - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
-        run: ${{ matrix.task }}
-
-  # TESTS WITH UDEV
-  checks_with_udev:
-    strategy:
-      matrix:
-        include:
-          - task: RUST_LOG=stratisd=debug make -f Makefile test-loop-valgrind
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-            components: cargo
-    runs-on: ubuntu-22.04
-    container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
-      options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev --ipc=host
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          asciidoc
-          clang
-          cryptsetup-devel
-          curl
-          device-mapper-persistent-data
-          dbus-devel
-          glibc-static
-          jq
-          libblkid-devel
-          make
-          sudo
-          systemd-devel
-          systemd-udev
-          valgrind
-          xfsprogs
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: ${{ matrix.components }}
-          toolchain: ${{ matrix.toolchain }}
-      - name: Build stratisd
-        run: PROFILEDIR=debug make -f Makefile build-all
-      - name: Install stratisd
-        run: PROFILEDIR=debug make -f Makefile install
-      - name: Reload udev
-        run: udevadm control --reload
-      - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
-        run: ${{ matrix.task }}
-
-  # TESTS WITH TANG
-  checks_with_tang:
-    strategy:
-      matrix:
-        include:
-          # MANDATORY CHECKS USING CURRENT DEVELOPMENT COMPILER
-          - task: >-
-              TANG_URL=tang
-              RUST_LOG=stratisd=debug
-              make -f Makefile test-clevis-loop-valgrind
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-            components: cargo
-            image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
-    runs-on: ubuntu-22.04
-    container:
-      image: ${{ matrix.image }}
-      options: --privileged -v /dev:/dev -v /run/udev:/run/udev --ipc=host
-    services:
-      tang:
-        # yamllint disable rule:line-length
-        image: ghcr.io/stratis-storage/stratisd/tang:38  # CURRENT DEVELOPMENT ENVIRONMENT
-        credentials:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-        options: --privileged -p 80:80
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          clang
-          cryptsetup-devel
-          clevis
-          clevis-luks
-          cracklib-dicts
-          curl
-          device-mapper-persistent-data
-          dbus-devel
-          jq
-          libblkid-devel
-          make
-          sudo
-          systemd-devel
-          systemd-udev
-          valgrind
-          xfsprogs
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: ${{ matrix.components }}
-          toolchain: ${{ matrix.toolchain }}
-      - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
-        run: ${{ matrix.task }}
-
-  python-based-tests:
-    strategy:
-      matrix:
-        include:
-          # MANDATORY CHECKS USING CURRENT DEVELOPMENT ENVIRONMENT
-          - toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-          # MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
-          - toolchain: 1.71.1  # LOWEST SUPPORTED RUST TOOLCHAIN
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Ubuntu
-        run: sudo apt-get -q update
-      - name: Install dependencies for Ubuntu
-        run: >
-          DEBIAN_FRONTEND=noninteractive
-          sudo apt-get install -y
-          asciidoc
-          clang
-          curl
-          libblkid-dev
-          libcryptsetup-dev
-          libdbus-1-dev
-          libdevmapper-dev
-          libsystemd-dev
-          libudev-dev
-          make
-          thin-provisioning-tools
-          udev
-          valgrind
-          xfsprogs
-      - name: Install Python dependencies
-        run: >
-          sudo python -m pip install
-          dbus-python
-          dbus-client-gen
-          dbus-python-client-gen
-          psutil
-          pyudev
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: cargo
-          toolchain: ${{ matrix.toolchain }}
-      - name: Build stratisd
-        run: PROFILEDIR=debug make -f Makefile build-all
-      - name: Install stratisd
-        run: sudo make PROFILEDIR=debug -f Makefile install
-      - name: Workaround for dbus inotify
-        run: sudo cp stratisd.conf /usr/share/dbus-1/system.d
-      - name: Reload udev
-        run: sudo udevadm control --reload
-      - name: Tests on ${{ matrix.image }} using Rust ${{ matrix.toolchain }}
-        run: >
-          sudo make
-          RUST_LOG=stratisd=debug
-          STRATISD="valgrind --leak-check=full --num-callers=500 /usr/libexec/stratisd"
-          PYTHONPATH=./src
-          udev-tests
-        working-directory: ./tests/client-dbus
-
-  # PYTHON-BASED TESTS WITH TANG
-  python-based-checks_with_tang:
-    runs-on: ubuntu-22.04
-    container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
-      options: --privileged -v /dev:/dev --userns=host --ipc=host -v /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro -v /usr/share/dbus-1:/usr/share/dbus-1 -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev
-    services:
-      tang:
-        # yamllint disable rule:line-length
-        image: ghcr.io/stratis-storage/stratisd/tang:38  # CURRENT DEVELOPMENT ENVIRONMENT
-        credentials:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-        options: --privileged -p 80:80
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          asciidoc
-          clang
-          clevis
-          clevis-luks
-          cracklib-dicts
-          cryptsetup-devel
-          curl
-          dbus-devel
-          device-mapper-persistent-data
-          glibc-static
-          libblkid-devel
-          make
-          ncurses
-          python3-dbus
-          python3-dbus-client-gen
-          python3-dbus-python-client-gen
-          python3-psutil
-          python3-pyudev
-          systemd-devel
-          systemd-udev
-          valgrind
-          xfsprogs
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: cargo
-          toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-      - name: Build stratisd
-        run: PROFILEDIR=debug make -f Makefile build-all
-      - name: Install stratisd
-        run: PROFILEDIR=debug make -f Makefile install
-      - name: Workaround for dbus inotify
-        run: cp stratisd.conf /usr/share/dbus-1/system.d
-      - name: Reload udev
-        run: udevadm control --reload
-      - name: Run D-Bus based bind tests
-        run: >
-          TANG_URL=tang
-          RUST_LOG=stratisd=debug
-          STRATISD="valgrind --leak-check=full --num-callers=500 /usr/libexec/stratisd"
-          PYTHONPATH=./src
-          make -f Makefile tang-tests
-        working-directory: ./tests/client-dbus
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
deleted file mode 100644
index e0a31d5151..0000000000
--- a/.github/workflows/weekly.yml
+++ /dev/null
@@ -1,107 +0,0 @@
----
-name: stratisd weekly
-
-# yamllint disable-line rule:truthy
-on:
-  schedule:
-    - cron: 15 3 * * 1
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  next-fedora-python-checks:
-    continue-on-error: true
-    strategy:
-      matrix:
-        include:
-          # PYTHON CHECKS ON NEXT FEDORA PYTHON AND PYTHON TOOLS VERSION
-          - dependencies: >
-              pylint
-              python3-dbus-client-gen
-              python3-dbus-python-client-gen
-              python3-justbytes
-              python3-psutil
-              python3-pyudev
-              python3-semantic_version
-            task: PYTHONPATH=./src make -f Makefile lint
-            working-directory: ./tests/client-dbus
-          - dependencies: black python3-isort
-            task: make -f Makefile fmt-ci
-            working-directory: ./tests/client-dbus
-          - dependencies: yamllint tmt
-            task: make -f Makefile yamllint tmtlint
-            working-directory: .
-          - dependencies: shfmt
-            task: make -f Makefile fmt-shell-ci
-            working-directory: .
-    runs-on: ubuntu-latest
-    container: fedora:39  # NEXT DEVELOPMENT ENVIRONMENT
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: >
-          dnf install -y
-          make
-          ncurses
-          python-unversioned-command
-          ${{ matrix.dependencies }}
-      - name: Display Python version
-        run: python --version
-      - name: ${{ matrix.task }}
-        run: ${{ matrix.task }}
-        working-directory: ${{ matrix.working-directory }}
-
-  legacy-audit-checks:
-    continue-on-error: true
-    strategy:
-      matrix:
-        include:
-          - tag: stratisd-v3.5.8
-          - tag: v3.5.7
-          - tag: v3.5.6
-          - tag: v3.5.5
-          - tag: v3.5.4
-          - tag: v3.5.3
-          - tag: v3.5.2
-          - tag: v3.5.1
-          - tag: v3.5.0
-          - tag: v3.4.4
-          - tag: v3.4.3
-          - tag: v3.4.2
-          - tag: v3.4.1
-          - tag: v3.4.0
-          - tag: v3.3.0
-          - tag: v3.2.0
-          - tag: v3.1.0
-          - tag: v3.0.0
-    runs-on: ubuntu-22.04
-    container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
-      options: --privileged -v /dev:/dev
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: tags/${{ matrix.tag }}
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          clang
-          curl
-          cryptsetup-devel
-          dbus-devel
-          libblkid-devel
-          make
-          ncurses
-          openssl-devel
-          systemd-devel
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: cargo
-          toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-      - uses: baptiste0928/cargo-install@v2
-        with:
-          crate: cargo-audit
-      - name: Run audit task on ${{ matrix.tag }}
-        run: make -f Makefile audit
diff --git a/.packit.yaml b/.packit.yaml
index e47a661229..6252e8be58 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -12,14 +12,14 @@ actions:
     post-upstream-clone:
         - "git clone https://github.com/stratis-storage/ci --depth=1 ../distro"
         - "mv ../distro/mockbuild_test/stratisd.spec ../distro/stratisd.spec"
-    create-archive:
+        - "cargo install cargo-version-util"
         - "cargo install cargo-vendor-filterer"
-        - "sh -c 'python3 ../distro/release_management/create_artifacts.py ../distro/ --pre-release --specfile-path=../distro/stratisd.spec stratisd $(rpmspec -q --srpm --qf %{Version} ../distro/stratisd.spec) --vendor-method=filtered'"
+    create-archive:
+        - "sh -c 'python3 ../distro/release_management/create_artifacts.py ../distro/ --pre-release --specfile-path=../distro/stratisd.spec stratisd --vendor-method=filtered'"
     fix-spec-file:
         - "echo 'skipping automatic fix-spec-file actions'"
     get-current-version:
-        # TODO:  Figure out a way to get this info via cargo
-        - "rpmspec -q --srpm --qf %{Version}\n ../distro/stratisd.spec"
+        - "cargo version-util get-version"
 
 srpm_build_deps:
     - git
@@ -30,10 +30,10 @@ jobs:
     - job: copr_build
       trigger: pull_request
       targets:
-          - fedora-stable
+          - fedora-rawhide
 
     - job: tests
       trigger: pull_request
       manual_trigger: true
       targets:
-          - fedora-stable
+          - fedora-rawhide