diff --git a/.azure-pipelines/advanced-test.yml b/.azure-pipelines/advanced-test.yml
index 628937740..012292ef2 100644
--- a/.azure-pipelines/advanced-test.yml
+++ b/.azure-pipelines/advanced-test.yml
@@ -9,6 +9,6 @@ pr: none
 jobs:
   # Any addition here should be reflected in the advanced and release pipelines.
   # It is advised to declare all jobs here as templates to improve maintainability.
-#  - template: templates/jobs/standard-tests-jobs.yml
+  - template: templates/jobs/standard-tests-jobs.yml
   - template: templates/jobs/extended-tests-jobs.yml
-#  - template: templates/jobs/packaging-jobs.yml
+  - template: templates/jobs/packaging-jobs.yml
diff --git a/.azure-pipelines/advanced.yml b/.azure-pipelines/advanced.yml
index b029f9d54..5ee31d55d 100644
--- a/.azure-pipelines/advanced.yml
+++ b/.azure-pipelines/advanced.yml
@@ -19,7 +19,7 @@ stages:
       - template: templates/jobs/standard-tests-jobs.yml
       - template: templates/jobs/extended-tests-jobs.yml
       - template: templates/jobs/packaging-jobs.yml
-#  - stage: Deploy
-#    jobs:
-#      - template: templates/jobs/deployment-jobs.yml
+  - stage: Deploy
+    jobs:
+      - template: templates/jobs/deployment-jobs.yml
   - template: templates/stages/notify-failure-stage.yml
diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
index 7fba72193..1d0abbc19 100644
--- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
@@ -6,78 +6,78 @@ jobs:
       - group: certbot-common
     strategy:
       matrix:
-#        linux-py36:
-#          PYTHON_VERSION: 3.6
-#          TOXENV: py36
-#        linux-py37:
-#          PYTHON_VERSION: 3.7
-#          TOXENV: py37
-#        linux-py37-nopin:
-#          PYTHON_VERSION: 3.7
-#          TOXENV: py37
-#          CERTBOT_NO_PIN: 1
-#        linux-boulder-v1-integration-certbot:
-#          TOXENV: integration-certbot-oldest
-#          ACME_SERVER: boulder-v1
-#        linux-boulder-v2-integration-certbot:
-#          TOXENV: integration-certbot-oldest
-#          ACME_SERVER: boulder-v2
-#        linux-boulder-v1-integration-nginx:
-#          TOXENV: integration-nginx-oldest
-#          ACME_SERVER: boulder-v1
-#        linux-boulder-v2-integration-nginx:
-#          TOXENV: integration-nginx-oldest
-#          ACME_SERVER: boulder-v2
-#        linux-boulder-v1-py27-integration:
-#          PYTHON_VERSION: 2.7
-#          TOXENV: integration
-#          ACME_SERVER: boulder-v1
-#        linux-boulder-v2-py27-integration:
-#          PYTHON_VERSION: 2.7
-#          TOXENV: integration
-#          ACME_SERVER: boulder-v2
-#        linux-boulder-v1-py35-integration:
-#          PYTHON_VERSION: 3.5
-#          TOXENV: integration
-#          ACME_SERVER: boulder-v1
-#        linux-boulder-v2-py35-integration:
-#          PYTHON_VERSION: 3.5
-#          TOXENV: integration
-#          ACME_SERVER: boulder-v2
-#        linux-boulder-v1-py36-integration:
-#          PYTHON_VERSION: 3.6
-#          TOXENV: integration
-#          ACME_SERVER: boulder-v1
-#        linux-boulder-v2-py36-integration:
-#          PYTHON_VERSION: 3.6
-#          TOXENV: integration
-#          ACME_SERVER: boulder-v2
-#        linux-boulder-v1-py37-integration:
-#          PYTHON_VERSION: 3.7
-#          TOXENV: integration
-#          ACME_SERVER: boulder-v1
-#        linux-boulder-v2-py37-integration:
-#          PYTHON_VERSION: 3.7
-#          TOXENV: integration
-#          ACME_SERVER: boulder-v2
-#        linux-boulder-v1-py38-integration:
-#          PYTHON_VERSION: 3.8
-#          TOXENV: integration
-#          ACME_SERVER: boulder-v1
-#        linux-boulder-v2-py38-integration:
-#          PYTHON_VERSION: 3.8
-#          TOXENV: integration
-#          ACME_SERVER: boulder-v2
-#        nginx-compat:
-#          TOXENV: nginx_compat
-#        le-auto-jessie:
-#          TOXENV: le_auto_jessie
-#        le-auto-centos6:
-#          TOXENV: le_auto_centos6
-#        le-auto-oraclelinux6:
-#          TOXENV: le_auto_oraclelinux6
-#        dev:
-#          TOXENV: docker_dev
+        linux-py36:
+          PYTHON_VERSION: 3.6
+          TOXENV: py36
+        linux-py37:
+          PYTHON_VERSION: 3.7
+          TOXENV: py37
+        linux-py37-nopin:
+          PYTHON_VERSION: 3.7
+          TOXENV: py37
+          CERTBOT_NO_PIN: 1
+        linux-boulder-v1-integration-certbot:
+          TOXENV: integration-certbot-oldest
+          ACME_SERVER: boulder-v1
+        linux-boulder-v2-integration-certbot:
+          TOXENV: integration-certbot-oldest
+          ACME_SERVER: boulder-v2
+        linux-boulder-v1-integration-nginx:
+          TOXENV: integration-nginx-oldest
+          ACME_SERVER: boulder-v1
+        linux-boulder-v2-integration-nginx:
+          TOXENV: integration-nginx-oldest
+          ACME_SERVER: boulder-v2
+        linux-boulder-v1-py27-integration:
+          PYTHON_VERSION: 2.7
+          TOXENV: integration
+          ACME_SERVER: boulder-v1
+        linux-boulder-v2-py27-integration:
+          PYTHON_VERSION: 2.7
+          TOXENV: integration
+          ACME_SERVER: boulder-v2
+        linux-boulder-v1-py35-integration:
+          PYTHON_VERSION: 3.5
+          TOXENV: integration
+          ACME_SERVER: boulder-v1
+        linux-boulder-v2-py35-integration:
+          PYTHON_VERSION: 3.5
+          TOXENV: integration
+          ACME_SERVER: boulder-v2
+        linux-boulder-v1-py36-integration:
+          PYTHON_VERSION: 3.6
+          TOXENV: integration
+          ACME_SERVER: boulder-v1
+        linux-boulder-v2-py36-integration:
+          PYTHON_VERSION: 3.6
+          TOXENV: integration
+          ACME_SERVER: boulder-v2
+        linux-boulder-v1-py37-integration:
+          PYTHON_VERSION: 3.7
+          TOXENV: integration
+          ACME_SERVER: boulder-v1
+        linux-boulder-v2-py37-integration:
+          PYTHON_VERSION: 3.7
+          TOXENV: integration
+          ACME_SERVER: boulder-v2
+        linux-boulder-v1-py38-integration:
+          PYTHON_VERSION: 3.8
+          TOXENV: integration
+          ACME_SERVER: boulder-v1
+        linux-boulder-v2-py38-integration:
+          PYTHON_VERSION: 3.8
+          TOXENV: integration
+          ACME_SERVER: boulder-v2
+        nginx-compat:
+          TOXENV: nginx_compat
+        le-auto-jessie:
+          TOXENV: le_auto_jessie
+        le-auto-centos6:
+          TOXENV: le_auto_centos6
+        le-auto-oraclelinux6:
+          TOXENV: le_auto_oraclelinux6
+        dev:
+          TOXENV: docker_dev
         farmtest-apache2:
           PYTHON_VERSION: 3.7
           TOXENV: azure-test-farm-apache2
diff --git a/.azure-pipelines/templates/steps/tox-steps.yml b/.azure-pipelines/templates/steps/tox-steps.yml
index 51684d9be..7d43126f5 100644
--- a/.azure-pipelines/templates/steps/tox-steps.yml
+++ b/.azure-pipelines/templates/steps/tox-steps.yml
@@ -32,7 +32,7 @@ steps:
       secureFile: azure-test-farm.pem
     condition: contains(variables['TOXENV'], 'test-farm')
   - bash: |
-      cp $(testFarmPem.secureFilePath) tests/letstest/azure-test-farm.pem
+      ln -s $(testFarmPem.secureFilePath) tests/letstest/azure-test-farm.pem
     condition: contains(variables['TOXENV'], 'test-farm')
   - bash: |
       if [[ "${TOXENV}" == *"oldest"* ]]; then