diff --git a/docker-bake.hcl b/docker-bake.hcl
index e6e0c8f40..caddceac5 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -11,10 +11,11 @@ target "gateway" {
   platforms = ["linux/amd64", "linux/arm64"]
   tags = formatlist("ghcr.io/graphql-hive/gateway:%s", split(",", GATEWAY_TAGS))
   annotations = [
-    "org.opencontainers.image.title=\"Hive Gateway\"",
-    "org.opencontainers.image.description=\"GraphQL Gateway by The Guild\"",
-    "org.opencontainers.image.licenses=MIT",
-    "org.opencontainers.image.source=https://github.com/graphql-hive/gateway/tree/main/packages/gateway",
-    "org.opencontainers.image.documentation=https://the-guild.dev/graphql/hive/docs/gateway/deployment/docker"
+    "index:org.opencontainers.image.title=\"Hive Gateway\"",
+    "index:org.opencontainers.image.description=\"GraphQL Gateway by The Guild\"",
+    "index:org.opencontainers.image.authors=\"The Guild\"",
+    "index:org.opencontainers.image.licenses=MIT",
+    "index:org.opencontainers.image.source=https://github.com/graphql-hive/gateway/tree/main/packages/gateway",
+    "index:org.opencontainers.image.documentation=https://the-guild.dev/graphql/hive/docs/gateway/deployment/docker"
   ]
 }