diff --git a/build.py b/build.py
index 9e4d198..af78598 100644
--- a/build.py
+++ b/build.py
@@ -4,40 +4,42 @@ from version import *
 from release_mixin import *
 
 CONFIG_FILE = ''
-COMMIT_ID = ''
+MAIN_BRANCH = 'main'
 
 class MyBuild(ReleaseMixin):
     pass
 
-def main():
-    init_project()
-
 @init
 def initialize(project):
     project.build_depends_on('ddadevops>=3.1.2')
-
-    if COMMIT_ID == '':
-        COMMIT_ID = 'HEAD'
-
-    config = create_release_mixin_config(CONFIG_FILE, COMMIT_ID)
-
-    
-    build = MyBuild(project, config)    
-    release_version, bump_version = build.init()
-    build.prepare()
-    build.tag_and_push()
-
-    
-    
-    
+    config = create_release_mixin_config(CONFIG_FILE, MAIN_BRANCH)
+    build = MyBuild(project, config)
+    build.init()
 
 @task
-def prepare(project):
+def release(project):
     build = get_devops_build(project)
-    build.prepare_release()
 
-@task 
-def tag_and_push(project):
-    build = get_devops_build(project)
-    build.tag_and_push()
-   
+    prepare_release(build)
+    tag_and_push_release(build)
+
+    prepare_version_bump(build)
+    tag_and_push_version_bump(build)
+
+def prepare_release(build):
+    release_version = build.release_version
+    build.prepare(release_version)
+
+def tag_and_push_release(build):
+    release_version = build.release_version
+    build.tag_and_push(release_version)
+
+def prepare_version_bump(build):
+    bump_version = build.bump_version
+    build.prepare(bump_version)
+
+def tag_and_push_version_bump(build):
+    bump_version = build.bump_version
+    build.tag_and_push(bump_version)
+
+