diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4f98ca7..92b50ac 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ See the chapter [PyTM-users](#PyTM-users) below for guidance on posting to the u
 
 When reporting an issue, it's most helpful to provide the following information, where applicable:
 * How does the problem look like and what steps reproduce it?
-* Can you reproduce it using the latest [master](https://github.com/izar/pytm/tree/master)?
+* Can you reproduce it using the latest [master](https://github.com/OWASP/pytm/tree/master)?
 * What is your running environment? In particular:
 	* OS,
 	* Python version,
@@ -40,7 +40,7 @@ To regenerate test fixtures for `json.dumps` and report tests add a `print(outpu
 
 Before you post to the [PyTM-users list](https://groups.google.com/forum/#!forum/pytm-users), make sure you look for existing solutions.
 
-* [GitHub issues](https://github.com/izar/pytm/issues) tracker (some problems have been answered there),
+* [GitHub issues](https://github.com/OWASP/pytm/issues) tracker (some problems have been answered there),
 
 Found a post/issue with your exact problem, but with no answer?
 Don't just leave a "me too" message - provide the details of your case.
diff --git a/README.md b/README.md
index bbd70d6..b23c26b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![build+test](https://github.com/izar/pytm/workflows/build%2Btest/badge.svg)
+![build+test](https://github.com/OWASP/pytm/workflows/build%2Btest/badge.svg)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/11093/badge)](https://www.bestpractices.dev/projects/11093)
 
 # pytm: A Pythonic framework for threat modeling
@@ -431,7 +431,7 @@ Once a threat model is done and ready, the dreaded presentation stage comes in -
 
 
 
-https://github.com/izar/pytm/assets/368769/30218241-c7cc-4085-91e9-bbec2843f838
+https://github.com/OWASP/pytm/assets/368769/30218241-c7cc-4085-91e9-bbec2843f838
 
 
 
diff --git a/pyproject.toml b/pyproject.toml
index c860358..bf8d233 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,16 +1,12 @@
-[tool.poetry]
+[project]
 name = "pytm"
 version = "1.4.0"
 description = "A Pythonic framework for threat modeling"
-authors = ["pytm Team <please_use_github_issues@nowhere.com>"]
-license = "MIT License"
+authors = [{ name = "pytm Team", email = "please_use_github_issues@nowhere.com" }]
+license = "MIT"
+requires-python = ">=3.11,<3.15"
 readme = "README.md"
-homepage = "https://github.com/OWASP/pytm"
 packages = [{include = "pytm"}]
-include = [
-    "pytm/images/*.png",
-    "pytm/threatlib/threats.json",
-]
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
@@ -21,16 +17,21 @@ classifiers = [
     "Topic :: Security",
     "Natural Language :: English",
 ]
+dependencies = [
+    "pydantic>=2.10.0,<3.0.0",
+]
 
-[tool.poetry.dependencies]
-python = "^3.11"
-pydantic = "^2.10.0"
 
-[tool.poetry.group.dev.dependencies]
-pytest = "^8.3.5"
-black = "^25.9.0"
-pdoc3 = "^0.11.6"
-ruff = "^0.15.11"
+[dependency-groups]
+dev = [
+    "pytest>=8.3.5,<9.0.0",
+    "black>=25.9.0,<26.0.0",
+    "pdoc3>=0.11.6,<0.12.0",
+    "ruff>=0.15.11,<0.16.0",
+]
+
+[project.urls]
+homepage = "https://github.com/OWASP/pytm"
 
 [tool.ruff]
 target-version = "py311"
@@ -49,5 +50,8 @@ ignore = [
 ]
 
 [build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["pytm"]