diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae938dd..de2a5b0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
       -
         name: Docker meta
         id: meta
-        uses: crazy-max/ghaction-docker-meta@v2
+        uses: docker/metadata-action@v3
         with:
           images: |
             ${{ env.DOCKERHUB_SLUG }}
diff --git a/docker-bake.hcl b/docker-bake.hcl
index d820568..233d686 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -2,8 +2,8 @@ variable "DEFAULT_TAG" {
   default = "librenms:local"
 }
 
-// Special target: https://github.com/crazy-max/ghaction-docker-meta#bake-definition
-target "ghaction-docker-meta" {
+// Special target: https://github.com/docker/metadata-action#bake-definition
+target "docker-metadata-action" {
   tags = ["${DEFAULT_TAG}"]
 }
 
@@ -13,7 +13,7 @@ group "default" {
 }
 
 target "image" {
-  inherits = ["ghaction-docker-meta"]
+  inherits = ["docker-metadata-action"]
 }
 
 target "image-local" {