diff --git a/.azure/ci.yml b/.azure/ci.yml
index b9fb575..fabe923 100644
--- a/.azure/ci.yml
+++ b/.azure/ci.yml
@@ -18,13 +18,13 @@ stages:
           - checkout: self
             fetchDepth: 0
 
-          - task: gitversion/setup@1.0.0
+          - task: gittools.gittools.setup-gitversion-task.gitversion/setup@1
             displayName: Install GitVersion
             inputs:
               versionSpec: '5.x'
               includePrerelease: false
 
-          - task: gitversion/execute@1.0.0
+          - task: gittools.gittools.execute-gitversion-task.gitversion/execute@1
             name: version_step # step id used as reference for output values
             displayName: Use GitVersion
             inputs:
@@ -55,13 +55,13 @@ stages:
           - checkout: self
             fetchDepth: 0
 
-          - task: gitversion/setup@1.0.0
+          - task: gittools.gittools.setup-gitversion-task.gitversion/setup@1
             displayName: Install GitVersion
             inputs:
               versionSpec: '6.x'
               includePrerelease: true
 
-          - task: gitversion/execute@1.0.0
+          - task: gittools.gittools.execute-gitversion-task.gitversion/execute@1
             name: version_step # step id used as reference for output values
             displayName: Use GitVersion
             inputs:
diff --git a/.azure/different-stage.yml b/.azure/different-stage.yml
index 0255fb8..d5c9140 100644
--- a/.azure/different-stage.yml
+++ b/.azure/different-stage.yml
@@ -10,13 +10,13 @@ stages:
           - checkout: self
             fetchDepth: 0
 
-          - task: gitversion/setup@1.0.0
+          - task: gittools.gittools.setup-gitversion-task.gitversion/setup@1
             displayName: Install GitVersion
             inputs:
               versionSpec: '5.x'
               includePrerelease: false
 
-          - task: gitversion/execute@1.0.0
+          - task: gittools.gittools.execute-gitversion-task.gitversion/execute@1
             name: version_step # step id used as reference for output values
             displayName: Use GitVersion
             inputs:
diff --git a/.azure/same-job.yml b/.azure/same-job.yml
index ec3673d..036463c 100644
--- a/.azure/same-job.yml
+++ b/.azure/same-job.yml
@@ -15,13 +15,13 @@ jobs:
       - checkout: self
         fetchDepth: 0
 
-      - task: gitversion/setup@1.0.0
+      - task: gittools.gittools.setup-gitversion-task.gitversion/setup@1
         displayName: Install GitVersion
         inputs:
           versionSpec: '5.x'
           includePrerelease: false
 
-      - task: gitversion/execute@1.0.0
+      - task: gittools.gittools.execute-gitversion-task.gitversion/execute@1
         name: version_step # step id used as reference for output values
         displayName: Use GitVersion
         inputs:
diff --git a/.azure/same-stage.yml b/.azure/same-stage.yml
index 48087a9..57bebb6 100644
--- a/.azure/same-stage.yml
+++ b/.azure/same-stage.yml
@@ -10,13 +10,13 @@ stages:
           - checkout: self
             fetchDepth: 0
 
-          - task: gitversion/setup@1.0.0
+          - task: gittools.gittools.setup-gitversion-task.gitversion/setup@1
             displayName: Install GitVersion
             inputs:
               versionSpec: '5.x'
               includePrerelease: false
 
-          - task: gitversion/execute@1.0.0
+          - task: gittools.gittools.execute-gitversion-task.gitversion/execute@1
             name: version_step # step id used as reference for output values
             displayName: Use GitVersion
             inputs: