diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index 67a0b12..e4cac32 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
-        python: ["3.8", "3.9", "3.10"]
+        python: ["3.8", "3.9", "3.10", "3.11"]
         
     steps:
       - uses: actions/checkout@v2
diff --git a/README.rst b/README.rst
index 33f66a6..8ba6966 100644
--- a/README.rst
+++ b/README.rst
@@ -2,15 +2,12 @@
 .. image:: https://dev.azure.com/data61/Anonlink/_apis/build/status/data61.anonlink?branchName=main
     :target: https://dev.azure.com/data61/Anonlink/_build/latest?definitionId=3&branchName=main
 
+.. image:: https://github.com/data61/anonlink/actions/workflows/unittests.yml/badge.svg?branch=main
+    :target: https://github.com/data61/anonlink/actions/workflows/unittests.yml
 
-.. image:: https://codecov.io/gh/data61/anonlink/branch/main/graph/badge.svg
+.. image:: https://codecov.io/gh/data61/anonlink/branch/main/graph/badge.svg?token=04DblXwUsT
     :target: https://codecov.io/gh/data61/anonlink
 
-
-.. image:: https://requires.io/github/data61/anonlink/requirements.svg?branch=main
-    :target: https://requires.io/github/data61/anonlink/requirements/?branch=main
-
-
 .. image:: https://pepy.tech/badge/anonlink
     :target: https://pepy.tech/project/anonlink
 
diff --git a/azurePipeline.yml b/azurePipeline.yml
index 950cc7d..6f860b6 100644
--- a/azurePipeline.yml
+++ b/azurePipeline.yml
@@ -13,7 +13,7 @@ stages:
     # Need to install development libraries for manylinux container
     CIBW_BEFORE_ALL_LINUX: 'yum install -y libffi-devel atlas-devel'
     # Only build for Python36+, and x64 arch
-    CIBW_BUILD: 'cp310-* cp39-* cp38-* cp37-* cp36-*'
+    CIBW_BUILD: 'cp310-* cp39-* cp38-*'
     CIBW_SKIP: '*-win32 *-manylinux_i686 *-musllinux_*'
     #CIBW_BEFORE_TEST: pip install -r {project}/requirements.txt
     #CIBW_TEST_COMMAND: "pytest {project}/tests"
@@ -45,24 +45,6 @@ stages:
       steps:
         - {task: UsePythonVersion@0, inputs: {versionSpec: '3.8', architecture: x64}}
         - template: .azurePipeline/cibuildwheel_steps.yml
-    - job: linux_37
-      displayName: Linux + Python3.7
-      pool:
-        vmImage: 'ubuntu-20.04'
-      variables:
-        CIBW_BUILD: 'cp37-*'
-      steps:
-        - {task: UsePythonVersion@0, inputs: {versionSpec: '3.7', architecture: x64}}
-        - template: .azurePipeline/cibuildwheel_steps.yml
-    - job: linux_36
-      displayName: Linux + Python3.6
-      pool:
-        vmImage: 'ubuntu-20.04'
-      variables:
-        CIBW_BUILD: 'cp36-*'
-      steps:
-        - {task: UsePythonVersion@0, inputs: {versionSpec: '3.6', architecture: x64}}
-        - template: .azurePipeline/cibuildwheel_steps.yml
     - job: macos
       displayName: MacOS
       pool:
@@ -70,8 +52,6 @@ stages:
       variables:
         MACOSX_DEPLOYMENT_TARGET: '10.15'
       steps:
-        - {task: UsePythonVersion@0, inputs: {versionSpec: '3.6', architecture: x64}}
-        - {task: UsePythonVersion@0, inputs: {versionSpec: '3.7', architecture: x64}}
         - {task: UsePythonVersion@0, inputs: {versionSpec: '3.8', architecture: x64}}
         - {task: UsePythonVersion@0, inputs: {versionSpec: '3.9', architecture: x64}}
         - template: .azurePipeline/cibuildwheel_steps.yml
@@ -80,8 +60,6 @@ stages:
       pool:
         vmImage: 'windows-2019'
       steps:
-        - {task: UsePythonVersion@0, inputs: {versionSpec: '3.6', architecture: x64}}
-        - {task: UsePythonVersion@0, inputs: {versionSpec: '3.7', architecture: x64}}
         - {task: UsePythonVersion@0, inputs: {versionSpec: '3.8', architecture: x64}}
         - {task: UsePythonVersion@0, inputs: {versionSpec: '3.9', architecture: x64}}
         - template: .azurePipeline/cibuildwheel_steps.yml
@@ -119,12 +97,6 @@ stages:
       vmImage: 'ubuntu-20.04'
     strategy:
       matrix:
-        Python3.6:
-          pythonVersion: '3.6'
-          artifactName: 'wheels.linux36'
-        Python3.7:
-          pythonVersion: '3.7'
-          artifactName: 'wheels.linux37'
         Python3.8:
           pythonVersion: '3.8'
           artifactName: 'wheels.linux38'
@@ -143,10 +115,6 @@ stages:
       vmImage: 'macOS-10.15'
     strategy:
       matrix:
-        Python3.7:
-          pythonVersion: '3.7'
-          artifactName: 'wheels.macos'
-          artifactPattern: '**/*cp37*.whl'
         Python3.8:
           pythonVersion: '3.8'
           artifactName: 'wheels.macos'
@@ -168,14 +136,6 @@ stages:
       vmImage: 'windows-2019'
     strategy:
       matrix:
-        Python3.6:
-          pythonVersion: '3.6'
-          artifactName: 'wheels.windows'
-          artifactPattern: '**/*cp36m*.whl'
-        Python3.7:
-          pythonVersion: '3.7'
-          artifactName: 'wheels.windows'
-          artifactPattern: '**/*cp37m*.whl'
         Python3.8:
           pythonVersion: '3.8'
           artifactName: 'wheels.windows'
@@ -220,7 +180,7 @@ stages:
       # the name of an Azure artifacts feed to publish artifacts to
       artifactFeed: anonlink
     steps:
-      - {task: UsePythonVersion@0, inputs: {versionSpec: '3.7', architecture: x64}}
+      - {task: UsePythonVersion@0, inputs: {versionSpec: '3.8', architecture: x64}}
       - script: 'pip install twine'
       - task: DownloadPipelineArtifact@2
         inputs:
diff --git a/setup.py b/setup.py
index 9194e69..5f5a3e1 100644
--- a/setup.py
+++ b/setup.py
@@ -100,6 +100,7 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Scientific/Engineering :: Information Analysis",
         "Topic :: Security :: Cryptography",