diff --git a/GitVersion.yml b/GitVersion.yml
index 329c13b..6d2b433 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,18 +1,21 @@
-mode: ContinuousDeployment
-next-version: 1.0.0
-assembly-versioning-scheme: 'MajorMinorPatchTag'
+assembly-versioning-scheme: MajorMinorPatchTag
 assembly-informational-format: '{NuGetVersionV2}+Sha.{Sha}.Date.{CommitDate}'
+mode: Mainline
+next-version: 1.0.0
 commit-message-incrementing: MergeMessageOnly
 branches:
-  develop:
-    tag: alpha
   master:
-    tag: beta
-    increment: Minor
-  features?[/-]:
+    tag: preview
     increment: Minor
-  releases?[/-]:
+  features:
+    increment: patch
+    regex: features?[/-]
+    source-branches:
+    - master
+  releases:
     increment: None
-
+    regex: releases?[/-]
+    source-branches:
+    - master
 ignore:
   sha: []
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c7b4455..ee26eae 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,7 +7,7 @@ pool:
   vmImage: 'VS2017-Win2016' #  options: 'Ubuntu 16.04', 'macOS 10.13', 'VS2017-Win2016'
 
 steps:
-- task: gittools.gitversion.gitversion-task.GitVersion@3
+- task: gittools.gitversion.gitversion-task.GitVersion@4
   displayName: GitVersion
 
 # As long as we're calling build.ps1, we don't need to bootstrap separately