diff --git a/pyproject.toml b/pyproject.toml
index f3b334e..18eb77b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,9 +6,6 @@ authors = ["Teemu <orkkiolento@gmail.com>", "Janne Vanhala <janne.vanhala@gmail.
 license = "BSD 3-Clause"
 readme = "README.md"
 keywords = ["testing", "pytest", "plugin"]
-
-repository = "https://github.com/Teemu/pytest-sugar"
-
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
@@ -21,7 +18,8 @@ classifiers = [
 ]
 
 [tool.poetry.urls]
-"Tracker" = "https://github.com/Teemu/pytest-sugar/issues"
+Homepage = "https://github.com/Teemu/pytest-sugar"
+"Issue Tracker" = "https://github.com/Teemu/pytest-sugar/issues"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"
diff --git a/setup.py b/setup.py
index 2965ea3..f14de30 100644
--- a/setup.py
+++ b/setup.py
@@ -29,10 +29,9 @@ def get_version(filename):
     long_description=codecs.open("README.md", encoding="utf-8").read(),
     long_description_content_type="text/markdown",
     version=get_version("pytest_sugar.py"),
-    url="https://pivotfinland.com/pytest-sugar/",
+    url="https://github.com/Teemu/pytest-sugar",
     project_urls={
-        "Source": "https://github.com/Teemu/pytest-sugar/",
-        "Tracker": "https://github.com/Teemu/pytest-sugar/issues",
+        "Issue Tracker": "https://github.com/Teemu/pytest-sugar/issues",
     },
     license="BSD",
     author="Teemu, Janne Vanhala and others",