diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
index e420d015..2bed33c2 100644
--- a/.github/auto_assign.yml
+++ b/.github/auto_assign.yml
@@ -1,8 +1,4 @@
 ---
 addReviewers: true
 addAssignees: author
-reviewers:
-  - tektronix/tm-devices-maintainers
-# Number of reviewers has no impact on GitHub teams
-# Set 0 to add all the reviewers (default: 0)
-numberOfReviewers: 0
+reviewers: [tektronix/tm-devices-maintainers]
diff --git a/.github/workflows/assign-reviewers.yml b/.github/workflows/assign-reviewers.yml
new file mode 100644
index 00000000..9237afe6
--- /dev/null
+++ b/.github/workflows/assign-reviewers.yml
@@ -0,0 +1,14 @@
+---
+name: Assign Reviewers to Pull Requests
+on:
+  pull_request:
+    types: [opened, ready_for_review, reopened]
+jobs:
+  assign-reviewers:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Assign Reviewers
+        uses: rowi1de/auto-assign-review-teams@v1.1.3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          teams: tm-devices-maintainers
diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml
index fc9fa1e8..c0679d32 100644
--- a/.github/workflows/package-build.yml
+++ b/.github/workflows/package-build.yml
@@ -29,9 +29,6 @@ jobs:
   # Upload to Test PyPI on every push to main
   test-pypi:
     name: Publish package to test.pypi.org
-    environment:
-      name: test-pypi
-      url: https://test.pypi.org/p/tm_devices
     if: github.repository == 'tektronix/tm_devices' && github.event_name == 'push'
       && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
@@ -40,7 +37,7 @@ jobs:
       - name: Download built package
         uses: actions/download-artifact@v3
         with:
-          name: Package
+          name: Packages
           path: dist
       - name: Upload package to Test PyPI
         uses: pypa/gh-action-pypi-publish@v1.8.8
@@ -50,9 +47,6 @@ jobs:
   # Upload to PyPI and create a tag in the repo after a GitHub Release is published
   pypi:
     name: Publish released package to pypi.org and create new tag in repo
-    environment:
-      name: pypi
-      url: https://pypi.org/p/tm_devices
     if: github.repository == 'tektronix/tm_devices' && github.event_name == 'release'
       && github.event.action == 'published'
     runs-on: ubuntu-latest
@@ -64,7 +58,7 @@ jobs:
       - name: Download built package
         uses: actions/download-artifact@v3
         with:
-          name: Package
+          name: Packages
           path: dist
       - name: Upload package to PyPI
         uses: pypa/gh-action-pypi-publish@v1.8.8
diff --git a/README.md b/README.md
index fdb73482..ab934731 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 <a href="https://github.com/tektronix/tm_devices/actions/workflows/test-docs.yml"><img alt="Docs testing status" src="https://github.com/tektronix/tm_devices/actions/workflows/test-docs.yml/badge.svg?branch=main"></a>
 <a href="https://github.com/tektronix/tm_devices/actions/workflows/package-build.yml"><img alt="Package build status" src="https://github.com/tektronix/tm_devices/actions/workflows/package-build.yml/badge.svg?branch=main"></a>
 <a href="https://codecov.io/gh/tektronix/tm_devices"><img alt="Coverage status" src="https://codecov.io/gh/tektronix/tm_devices/branch/main/graph/badge.svg"></a>
+<a href="https://www.codefactor.io/repository/github/tektronix/tm_devices"><img alt="CodeFactor grade" src="https://www.codefactor.io/repository/github/tektronix/tm_devices/badge" /></a>
 <a href="https://github.com/tektronix/tm_devices/actions/workflows/codeql-analysis.yml"><img alt="CodeQL status" src="https://github.com/tektronix/tm_devices/actions/workflows/codeql-analysis.yml/badge.svg?branch=main"></a>
 <a href="https://github.com/pre-commit/pre-commit"><img alt="pre-commit enabled" src="https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit"></a>
 <a href="https://results.pre-commit.ci/latest/github/tektronix/tm_devices/main"><img alt="pre-commit status" src="https://results.pre-commit.ci/badge/github/tektronix/tm_devices/main.svg"></a>