diff --git a/.azure-pipelines/advanced-test.yml b/.azure-pipelines/advanced-test.yml
index 025225871..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/standard-tests-jobs.yml
-  - template: templates/extended-tests-jobs.yml
-  - template: templates/packaging-jobs.yml
+  - template: templates/jobs/standard-tests-jobs.yml
+  - template: templates/jobs/extended-tests-jobs.yml
+  - template: templates/jobs/packaging-jobs.yml
diff --git a/.azure-pipelines/advanced.yml b/.azure-pipelines/advanced.yml
index eac39e16d..747ea0b5a 100644
--- a/.azure-pipelines/advanced.yml
+++ b/.azure-pipelines/advanced.yml
@@ -18,8 +18,8 @@ stages:
       # It is advised to declare all jobs here as templates to improve maintainability.
 #      - template: templates/standard-tests-jobs.yml
 #      - template: templates/extended-tests-jobs.yml
-      - template: templates/packaging-jobs.yml
+      - template: templates/jobs/packaging-jobs.yml
   - stage: Deploy
     jobs:
-      - template: templates/deployment-jobs.yml
-  - template: templates/notify-failure-steps.yml
+      - template: templates/jobs/deployment-jobs.yml
+  - template: templates/stages/notify-failure-stage.yml
diff --git a/.azure-pipelines/main.yml b/.azure-pipelines/main.yml
index 723b35d56..836e77122 100644
--- a/.azure-pipelines/main.yml
+++ b/.azure-pipelines/main.yml
@@ -5,4 +5,4 @@ pr:
   - '*.x'
 
 jobs:
-  - template: templates/standard-tests-jobs.yml
+  - template: templates/jobs/standard-tests-jobs.yml
diff --git a/.azure-pipelines/release.yml b/.azure-pipelines/release.yml
index ad33a4934..380be8d9c 100644
--- a/.azure-pipelines/release.yml
+++ b/.azure-pipelines/release.yml
@@ -10,11 +10,11 @@ stage:
     jobs:
       # Any addition here should be reflected in the advanced and advanced-test pipelines.
       # It is advised to declare all jobs here as templates to improve maintainability.
-      - template: templates/standard-tests-jobs.yml
-      - template: templates/extended-tests-jobs.yml
-      - template: templates/packaging-jobs.yml
-      - template: templates/changelog-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/changelog-jobs.yml
   - stage: Deploy
     jobs:
-      - template: templates/deployment-jobs.yml
-  - template: templates/notify-failure-steps.yml
+      - template: templates/jobs/deployment-jobs.yml
+  - template: templates/stages/notify-failure-stage.yml
diff --git a/.azure-pipelines/templates/changelog-jobs.yml b/.azure-pipelines/templates/jobs/changelog-jobs.yml
similarity index 100%
rename from .azure-pipelines/templates/changelog-jobs.yml
rename to .azure-pipelines/templates/jobs/changelog-jobs.yml
diff --git a/.azure-pipelines/templates/deployment-jobs.yml b/.azure-pipelines/templates/jobs/deployment-jobs.yml
similarity index 91%
rename from .azure-pipelines/templates/deployment-jobs.yml
rename to .azure-pipelines/templates/jobs/deployment-jobs.yml
index b4de97f45..a1ece1115 100644
--- a/.azure-pipelines/templates/deployment-jobs.yml
+++ b/.azure-pipelines/templates/jobs/deployment-jobs.yml
@@ -8,15 +8,13 @@ jobs:
           sudo apt-get install -y --no-install-recommends snap
           sudo snap install --classic snapcraft
         displayName: Install dependencies
-      - bash: |
-          mkdir .snapcraft
-          echo $(SNAPCRAFT_LOGIN_FILE) | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg
-        displayName: Prepare login to Snap store
       - task: DownloadPipelineArtifact@2
         inputs:
           artifact: snap
           path: $(Build.SourcesDirectory)/snap
         displayName: Retrieve Certbot snap
       - bash: |
+          mkdir .snapcraft
+          echo $(SNAPCRAFT_LOGIN_FILE) | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg
           snapcraft push --release=edge snap/*.snap
         displayName: Publish to Snap store
diff --git a/.azure-pipelines/templates/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
similarity index 98%
rename from .azure-pipelines/templates/extended-tests-jobs.yml
rename to .azure-pipelines/templates/jobs/extended-tests-jobs.yml
index c9229ece5..9f0acff24 100644
--- a/.azure-pipelines/templates/extended-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
@@ -93,4 +93,4 @@ jobs:
     pool:
       vmImage: $(IMAGE_NAME)
     steps:
-      - template: tox-steps.yml
+      - template: steps/tox-steps.yml
diff --git a/.azure-pipelines/templates/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml
similarity index 100%
rename from .azure-pipelines/templates/packaging-jobs.yml
rename to .azure-pipelines/templates/jobs/packaging-jobs.yml
diff --git a/.azure-pipelines/templates/standard-tests-jobs.yml b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
similarity index 97%
rename from .azure-pipelines/templates/standard-tests-jobs.yml
rename to .azure-pipelines/templates/jobs/standard-tests-jobs.yml
index c0db324df..0e30b820e 100644
--- a/.azure-pipelines/templates/standard-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
@@ -59,4 +59,4 @@ jobs:
     pool:
       vmImage: $(IMAGE_NAME)
     steps:
-      - template: tox-steps.yml
+      - template: steps/tox-steps.yml
diff --git a/.azure-pipelines/templates/notify-failure-steps.yml b/.azure-pipelines/templates/stages/notify-failure-stage.yml
similarity index 91%
rename from .azure-pipelines/templates/notify-failure-steps.yml
rename to .azure-pipelines/templates/stages/notify-failure-stage.yml
index 159cd21b6..d615416b6 100644
--- a/.azure-pipelines/templates/notify-failure-steps.yml
+++ b/.azure-pipelines/templates/stages/notify-failure-stage.yml
@@ -1,7 +1,7 @@
 stages:
-  - stage: Notify_Failure
+  - stage: On_Failure
     jobs:
-      - job: notify
+      - job: notify_mattermost
         pool:
           vmImage: ubuntu-latest
         steps:
diff --git a/.azure-pipelines/templates/tox-steps.yml b/.azure-pipelines/templates/steps/tox-steps.yml
similarity index 92%
rename from .azure-pipelines/templates/tox-steps.yml
rename to .azure-pipelines/templates/steps/tox-steps.yml
index 66b79513a..5d7af9935 100644
--- a/.azure-pipelines/templates/tox-steps.yml
+++ b/.azure-pipelines/templates/steps/tox-steps.yml
@@ -22,9 +22,8 @@ steps:
       versionSpec: $(PYTHON_VERSION)
       addToPath: true
     condition: ne(coalesce(variables['PYTHON_VERSION'], 'UNSPECIFIED'), 'UNSPECIFIED')
-    displayName: Activate selected Python version
   - bash: |
-      python tools/pip_install.py -U tox coverage
+      python tools/pip_install.py -I tox virtualenv
     displayName: Install runtime dependencies
   - bash: |
       if [[ "${TOXENV}" == *"test-farm"* ]]; then