diff --git a/.github/workflows/publiccodeyml-check.yml b/.github/workflows/publiccodeyml-check.yml
new file mode 100644
index 0000000000..8003750a8a
--- /dev/null
+++ b/.github/workflows/publiccodeyml-check.yml
@@ -0,0 +1,27 @@
+name: Validate publiccode.yml
+
+on:
+  push:
+    paths:
+      - "publiccode.yml"
+      - ".github/workflows/publiccode.yml"
+  pull_request:
+    paths:
+      - "publiccode.yml"
+      - ".github/workflows/publiccode.yml"
+
+permissions: {}
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    name: publiccode.yml validation
+    steps:
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
+
+      - uses: italia/publiccode-parser-action@21086c73ec0563e14c6748787efa1b34b025ad8c # v1
+        with:
+          publiccode: "publiccode.yml"
+          no-network: true
diff --git a/publiccode.yml b/publiccode.yml
index 7d49686d18..9b95e69e53 100644
--- a/publiccode.yml
+++ b/publiccode.yml
@@ -1,4 +1,4 @@
-publiccodeYmlVersion: 0.4.0
+publiccodeYmlVersion: "0"
 name: Waldur
 url: https://github.com/waldur/waldur-docs
 landingURL: https://waldur.com
@@ -72,7 +72,7 @@ description:
 
       HomePort: A modern ReactJS-based self-service portal for end customers
     documentation: https://docs.waldur.com
-    apiDocumentation: https://docs.waldur.com/latest/API/
+    apiDocumentation: https://api-docs.waldur.com
     features:
       - Hybrid Cloud Management
       - Team and Project Management