diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index fb371af..3be0940 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -35,10 +35,10 @@ jobs:
         run: |
           pytest --cov --cov-report=xml --cov-report=term --tb=line
 
-      - name: Sonar scan
-        uses: SonarSource/sonarqube-scan-action@v6.0.0
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      # - name: Sonar scan
+      #   uses: SonarSource/sonarqube-scan-action@v6.0.0
+      #   env:
+      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
 
   mypy:
diff --git a/.gitignore b/.gitignore
index 3341342..c14ba94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,5 @@ _tmp*
 tests/od/extra-compare*
 *.od
 *.json
+!/src/objdictgen/schema/*.json
 *.jsonc
diff --git a/pyproject.toml b/pyproject.toml
index 42d6dc8..0e3df18 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,14 +1,14 @@
 [build-system]
-requires = ["uv_build>=0.9.5,<0.10.0"]
-build-backend = "uv_build"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [project]
 name = "objdictgen"
-version = "3.5.4"
+version = "3.5.5"
+description = "CanFestival Object Dictionary tool"
 authors = [
-    {name = "Svein Seldal", email = "sveinse@laerdal.com"},
+    {name = "Svein Seldal", email = "svein.seldal@laerdal.com"},
 ]
-description = "CanFestival Object Dictionary tool"
 readme = "README.md"
 license = "LGPL-2.1-or-later"
 requires-python = ">=3.10,<4"
@@ -56,9 +56,17 @@ Repository = "https://github.com/Laerdal/python-objdictgen"
 [project.scripts]
 odg = "objdictgen.__main__:main"
 
-[tool.uv.build-backend]
-source-include = [
-    "tests/**",
+[tool.hatch.build.targets.wheel]
+packages = ["src/objdictgen"]
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "/packaging",
+    "/src/objdictgen",
+    "/tests",
+]
+exclude = [
+    "/tests/od/extra-compare",
 ]
 
 [tool.pytest.ini_options]