diff --git a/BUILD.md b/BUILD.md
index 17919d1a..6bc2638b 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -2,7 +2,7 @@
 
 This guide outlines the process for building PostgreSQL operand images for
 CloudNativePG using [Docker Bake](https://docs.docker.com/build/bake/) and a
-[GitHub workflow](.github/workflows/bake.yaml).
+[GitHub workflow](.github/workflows/bake.yml).
 
 The central component of this framework is the
 [Bake file (`docker-bake.hcl`)](docker-bake.hcl).
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 6a45a539..e91113a3 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -37,7 +37,7 @@ postgreSQLPreviewVersions = [
 ]
 
 // Barman version to build
-# renovate: datasource=github-releases depName=EnterpriseDB/barman versioning=loose
+// renovate: datasource=github-releases depName=EnterpriseDB/barman versioning=loose
 barmanVersion = "3.14.0"
 
 // Extensions to be included in the `standard` image
@@ -99,10 +99,10 @@ target "default" {
     "index,manifest:org.opencontainers.image.vendor=${authors}",
     "index,manifest:org.opencontainers.image.title=CloudNativePG PostgreSQL ${pgVersion} ${tgt}",
     "index,manifest:org.opencontainers.image.description=A ${tgt} PostgreSQL ${pgVersion} container image",
-    "index,manifest:org.opencontainers.image.documentation=https://github.com/cloudnative-pg/postgres-containers",
+    "index,manifest:org.opencontainers.image.documentation=${url}",
     "index,manifest:org.opencontainers.image.authors=${authors}",
     "index,manifest:org.opencontainers.image.licenses=Apache-2.0",
-    "index,manifest:org.opencontainers.image.base.name=docker.io/library/${tag(base)}",
+    "index,manifest:org.opencontainers.image.base.name=docker.io/library/debian:${tag(base)}",
     "index,manifest:org.opencontainers.image.base.digest=${digest(base)}"
   ]
   labels = {