diff --git a/pipelines/azure-build.yaml b/pipelines/azure-build.yaml
index 964a7775..17183d7b 100644
--- a/pipelines/azure-build.yaml
+++ b/pipelines/azure-build.yaml
@@ -6,7 +6,7 @@ trigger:
 pr: none
 
 pool:
-  vmImage: "ubuntu-18.04"
+  vmImage: "ubuntu-20.04"
 
 resources:
   containers:
@@ -37,7 +37,7 @@ stages:
         steps:
           - task: UsePythonVersion@0
             displayName: Set python version
-            inputs: { versionSpec: 3.8 }
+            inputs: { versionSpec: 3.9 }
           - script: |
               export VERSION=${BUILD_SOURCEBRANCH#"refs/tags/v"}
               export COMMIT=`git rev-parse --verify ${BUILD_SOURCEBRANCH}`
@@ -59,12 +59,6 @@ stages:
   - stage: test
     jobs:
       - job: run_test
-        strategy:
-          matrix:
-            python3_7:
-              python.version: "3.7"
-            Python3_8:
-              python.version: "3.8"
         timeoutInMinutes: 10
         services:
           elasticsearch: elasticsearch
@@ -74,8 +68,7 @@ stages:
           - checkout: none
           - task: UsePythonVersion@0
             displayName: Set python version
-            inputs:
-              versionSpec: "$(python.version)"
+            inputs: { versionSpec: 3.9 }
           - download: current
             artifact: dist
           - download: current
@@ -120,7 +113,7 @@ stages:
         steps:
           - task: UsePythonVersion@0
             displayName: Set python version
-            inputs: { versionSpec: 3.8 }
+            inputs: { versionSpec: 3.9 }
           - download: current
             artifact: dist
           - script: |
diff --git a/pipelines/azure-test.yaml b/pipelines/azure-test.yaml
index 371f239b..89d8cac5 100644
--- a/pipelines/azure-test.yaml
+++ b/pipelines/azure-test.yaml
@@ -4,7 +4,7 @@ trigger: ["*"]
 pr: ["*"]
 
 pool:
-  vmImage: "ubuntu-18.04"
+  vmImage: "ubuntu-20.04"
 
 resources:
   containers:
@@ -41,10 +41,10 @@ jobs:
   - job: run_test
     strategy:
       matrix:
-        python3_7:
-          python.version: "3.7"
-        Python3_8:
-          python.version: "3.8"
+        python3_9:
+          python.version: "3.9"
+        # Python3_10:
+        #   python.version: "3.10"
 
     timeoutInMinutes: 15
     services:
diff --git a/setup.py b/setup.py
index d76dac87..b361ad98 100644
--- a/setup.py
+++ b/setup.py
@@ -26,12 +26,13 @@
     author_email="assemblyline@cyber.gc.ca",
     license="MIT",
     classifiers=[
-        'Development Status :: 2 - Pre-Alpha',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Libraries',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     keywords="assemblyline automated malware analysis gc canada cse-cst cse cst cyber cccs",
     packages=find_packages(),