diff --git a/GitVersion.yml b/GitVersion.yml
index 734e32408..d8a8d4453 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -5,29 +5,43 @@ branches:
   v1_develop:
     mode: ContinuousDeployment
     tag: pre
+    regex: ^v1_develop?[/-]
+    is-release-branch: false
+    source-branches:
+    - v1
   v1:
     tag: rc
     increment: Patch
-    source-branches:
-    - v1_develop
+    regex: ^v2?[/-]
+    is-release-branch: false
+    source-branches: []
+    is-mainline: true
 
   v2_develop:
     mode: ContinuousDeployment
     tag: pre
-  v2:
-    tag: alpha
-    increment: Patch
+    regex: ^v2_develop?[/-]
+    is-release-branch: false
+    tracks-release-branches: true
     source-branches:
     - v2_develop
-- 
-  # feature:
-  #   tag: useBranchName
-  #   regex: ^features?[/-]
-  #   source-branches:
-  #   - v1
-  #   - v1_develop
-  #   - v2
-  #   - v2_develop
+  v2:
+    mode: ContinuousDeployment
+    tag: alpha
+    increment: Patch
+    regex: ^v2?[/-]
+    is-release-branch: false
+    source-branches: []
+    is-mainline: true
+
+  feature:
+    tag: useBranchName
+    regex: ^features?[/-]
+    source-branches:
+    - v1
+    - v1_develop
+    - v2
+    - v2_develop
  
   pull-request:
     tag: PullRequest.{BranchName}