diff --git a/README.md b/README.md
index 82d07ba..b94a186 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # publiccode.yml RESTful validator API
 
-A RESTful API for validating [publiccode.yml](https://github.com/italia/publiccode.yml)
+A RESTful API for validating [publiccode.yml](https://github.com/publiccodeyml/publiccode.yml)
 files, using the [libpubliccode](https://github.com/publiccodeyml/libpubliccode)
 library.
 
@@ -8,7 +8,7 @@ library.
 
 The OpenAPI spec is in [`publiccode-validator-api.oas.yaml`](publiccode-validator-api.oas.yaml).
 
-[Browse the interactive Swagger UI preview](https://petstore.swagger.io/?url=https://raw.githubusercontent.com/italia/publiccode-validator-api/main/publiccode-validator-api.oas.yaml)
+[Browse the interactive Swagger UI preview](https://petstore.swagger.io/?url=https://raw.githubusercontent.com/publiccodeyml/publiccode-validator-api/main/publiccode-validator-api.oas.yaml)
 
 ## Usage
 
diff --git a/publiccode-validator-api.oas.yaml b/publiccode-validator-api.oas.yaml
index 772d6de..3904ee5 100644
--- a/publiccode-validator-api.oas.yaml
+++ b/publiccode-validator-api.oas.yaml
@@ -14,7 +14,7 @@ info:
     name: AGPL-3.0
     identifier: AGPL-3.0-only
   contact:
-    url: "https://github.com/italia/publiccode-validator-api"
+    url: "https://github.com/publiccodeyml/publiccode-validator-api"
 
 servers:
   - url: /v1