diff --git a/.github/workflows/testing-pipeline.yml b/.github/workflows/testing-pipeline.yml
index 3e63f35d1..2ca7464bd 100644
--- a/.github/workflows/testing-pipeline.yml
+++ b/.github/workflows/testing-pipeline.yml
@@ -37,20 +37,32 @@ jobs:
       - name: Run Python Tests
         run: ci/run_python_tests.sh
 
-  lint_python_2020:
-    name: Lint Python Code (CY2020)
+  test_cuebot_2020:
+    name: Build Cuebot and Run Unit Tests (CY2020)
     runs-on: ubuntu-latest
-    container: aswf/ci-opencue:2020
+    container:
+      image: aswf/ci-opencue:2020
     steps:
       - uses: actions/checkout@v2
-      - name: Lint Python Code
-        run: ci/run_python_lint.sh
+      - name: Build with Gradle
+        run: |
+          chown -R aswfuser:aswfgroup .
+          su -c "cd cuebot && ./gradlew build --stacktrace --info" aswfuser
 
-  test_cuebot_2020:
-    name: Build Cuebot and Run Unit Tests (CY2020)
+  test_python_2021:
+    name: Run Python Unit Tests (CY2021)
+    runs-on: ubuntu-latest
+    container: aswf/ci-opencue:2021
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run Python Tests
+        run: ci/run_python_tests.sh
+
+  test_cuebot_2021:
+    name: Build Cuebot and Run Unit Tests (CY2021)
     runs-on: ubuntu-latest
     container:
-      image: aswf/ci-opencue:2020
+      image: aswf/ci-opencue:2021
     steps:
       - uses: actions/checkout@v2
       - name: Build with Gradle
@@ -58,6 +70,15 @@ jobs:
           chown -R aswfuser:aswfgroup .
           su -c "cd cuebot && ./gradlew build --stacktrace --info" aswfuser
 
+  lint_python:
+    name: Lint Python Code
+    runs-on: ubuntu-latest
+    container: aswf/ci-opencue:2021
+    steps:
+      - uses: actions/checkout@v2
+      - name: Lint Python Code
+        run: ci/run_python_lint.sh
+
   test_sphinx:
     name: Test Documentation Build
     runs-on: ubuntu-latest
diff --git a/README.md b/README.md
index a198513c8..5ef264e19 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ![OpenCue](/images/opencue_logo_with_text.png)
 
-[![Supported VFX Platform Versions](https://img.shields.io/badge/vfx%20platform-2019--2020-lightgrey.svg)](http://www.vfxplatform.com/)
-![Supported Python Versions](https://img.shields.io/badge/python-2.7%2C%203.6%2C%203.7-blue.svg)
+[![Supported VFX Platform Versions](https://img.shields.io/badge/vfx%20platform-2019--2021-lightgrey.svg)](http://www.vfxplatform.com/)
+![Supported Python Versions](https://img.shields.io/badge/python-2.7%2C%203.6%2C%203.9-blue.svg)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2837/badge)](https://bestpractices.coreinfrastructure.org/projects/2837)
 
 - [Introduction](#Introduction)
diff --git a/cueadmin/setup.py b/cueadmin/setup.py
index 6b6ec92e6..3b829a089 100644
--- a/cueadmin/setup.py
+++ b/cueadmin/setup.py
@@ -46,6 +46,8 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     packages=find_packages(),
     entry_points={
diff --git a/cuegui/setup.py b/cuegui/setup.py
index eff519b23..79882eda3 100644
--- a/cuegui/setup.py
+++ b/cuegui/setup.py
@@ -46,6 +46,8 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     packages=find_packages(),
     package_data={
diff --git a/cuesubmit/setup.py b/cuesubmit/setup.py
index dd4f8b462..e9b82d3b4 100644
--- a/cuesubmit/setup.py
+++ b/cuesubmit/setup.py
@@ -43,6 +43,11 @@
 
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     packages=find_packages(),
     package_data={
diff --git a/pycue/setup.py b/pycue/setup.py
index 0906e9351..0750ab016 100644
--- a/pycue/setup.py
+++ b/pycue/setup.py
@@ -46,6 +46,8 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     packages=find_packages(exclude=['tests']),
     package_data={
diff --git a/pyoutline/setup.py b/pyoutline/setup.py
index 5663a5fa0..a18b50d4f 100644
--- a/pyoutline/setup.py
+++ b/pyoutline/setup.py
@@ -46,6 +46,8 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     packages=find_packages(exclude=['tests']),
     data_files=[
diff --git a/rqd/setup.py b/rqd/setup.py
index f3151326f..c1f7b9cc4 100644
--- a/rqd/setup.py
+++ b/rqd/setup.py
@@ -43,6 +43,11 @@
 
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     packages=find_packages(),
     entry_points={