diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1e7bc59..3523cc2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -69,7 +69,7 @@ jobs:
             DOCKER_TAG_LATEST="latest"
           fi
 
-          # Generate docker tags
+          # Generate Docker tags
           IMAGE_NAME_WITH_TAG_VERSION="${{ env.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:${PACKAGE_VERSION}"
           IMAGE_NAME_WITH_TAG_LATEST="${{ env.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:${DOCKER_TAG_LATEST}"
 
@@ -98,7 +98,8 @@ jobs:
         shell: bash
         run: |
           set -x
-          sudo apt-get -y install twine
+          python -m pip install --upgrade pip setuptools wheel build
+          pip install twine
           pip install -r requirements-build.txt
           python -m build
           twine check dist/*
diff --git a/pyproject.toml b/pyproject.toml
index de9c2db..b5bf6ee 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,41 +1,38 @@
 [project]
 name = "pygitver"
-version = "0.1.3"
+version = "0.2.0"
 authors = [
   { name="Yurii Puchkov", email="panpuchkov@gmail.com" },
 ]
-license = {text = "GNU General Public License v3 (GPLv3)"}
 description = "Manages Git Tag versions and generates ChangeLog"
-keywords = ["git tag", "version", "versions", "conventional commit", "semver", "changelog", "changelogs"]
 readme = "README.md"
 requires-python = ">=3.8"
+keywords = ["git tag", "version", "versions", "conventional commit", "semver", "changelog", "changelogs"]
+license = "GPL-3.0-or-later"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
     "Natural Language :: English",
     "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Operating System :: OS Independent",
 ]
 dependencies = [
     "Jinja2==3.1.2"
 ]
-
-
-[build-system]
-requires = ["setuptools>=63", "wheel"]
-build-backend = "setuptools.build_meta"
-
+urls = { "Homepage" = "https://github.com/panpuchkov/pygitver" }
 
 [project.scripts]
 pygitver = "pygitver.pygitver:main"
 
-[metadata]
-url = "https://github.com/panpuchkov/pygitver"
+
+[build-system]
+requires = ["hatchling==1.26.3", "hatch-vcs"]
+build-backend = "hatchling.build"
 
 
 [tool.setuptools.packages.find]
 where = ["src"]
 
+
 [tool.setuptools.package-data]
 "*" = ["*"]
diff --git a/src/pygitver/git.py b/src/pygitver/git.py
index 470daca..89fcb9d 100644
--- a/src/pygitver/git.py
+++ b/src/pygitver/git.py
@@ -23,7 +23,7 @@ class GitError(Exception):
 
 
 class Git:
-    __version__ = "0.1.3"
+    __version__ = "0.2.0"
 
     @staticmethod
     def _cmd(command: str) -> str: