diff --git a/buildtools/libinjection/Dockerfile b/buildtools/libinjection/Dockerfile
index a9cb6b2c7f75..9d0c378704eb 100644
--- a/buildtools/libinjection/Dockerfile
+++ b/buildtools/libinjection/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2022 The OWASP Coraza contributors
 # SPDX-License-Identifier: Apache-2.0
 
-FROM ghcr.io/anuraaga/coraza-wasm-filter/buildtools-wasi-sdk:main
+FROM ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-wasi-sdk:main
 
 RUN apt-get install -y patch
 
diff --git a/buildtools/re2/Dockerfile b/buildtools/re2/Dockerfile
index 207ac174c5ca..7069cd6e72ca 100644
--- a/buildtools/re2/Dockerfile
+++ b/buildtools/re2/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2022 The OWASP Coraza contributors
 # SPDX-License-Identifier: Apache-2.0
 
-FROM ghcr.io/anuraaga/coraza-wasm-filter/buildtools-wasi-sdk:main
+FROM ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-wasi-sdk:main
 
 RUN apt-get install -y patch
 
diff --git a/buildtools/tinygo/Dockerfile b/buildtools/tinygo/Dockerfile
index 1ccb528f0128..30c0a91344c0 100644
--- a/buildtools/tinygo/Dockerfile
+++ b/buildtools/tinygo/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2022 The OWASP Coraza contributors
 # SPDX-License-Identifier: Apache-2.0
 
-FROM ghcr.io/anuraaga/coraza-wasm-filter/buildtools-wasi-sdk:main
+FROM ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-wasi-sdk:main
 
 ARG TARGETARCH
 
diff --git a/magefile.go b/magefile.go
index 795fcfac4394..49977d2513c1 100644
--- a/magefile.go
+++ b/magefile.go
@@ -112,7 +112,7 @@ wasm-opt -Os -c build/mainraw.wasm -o build/mainopt.wasm && \
 wasm2wat --enable-all build/mainopt.wasm -o build/mainopt.wat
 `, timingBuildTag)
 
-	if err := sh.RunV("docker", "run", "--pull", "always", "--rm", "-v", fmt.Sprintf("%s:/src", wd), "ghcr.io/anuraaga/coraza-wasm-filter/buildtools-tinygo:main", "bash", "-c",
+	if err := sh.RunV("docker", "run", "--pull", "always", "--rm", "-v", fmt.Sprintf("%s:/src", wd), "ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-tinygo:main", "bash", "-c",
 		strings.TrimSpace(script)); err != nil {
 		return err
 	}
@@ -128,7 +128,7 @@ wasm2wat --enable-all build/mainopt.wasm -o build/mainopt.wat
 	if err != nil {
 		return err
 	}
-	return sh.RunV("docker", "run", "--rm", "-v", fmt.Sprintf("%s:/build", filepath.Join(wd, "build")), "ghcr.io/anuraaga/coraza-wasm-filter/buildtools-tinygo:main", "bash", "-c",
+	return sh.RunV("docker", "run", "--rm", "-v", fmt.Sprintf("%s:/build", filepath.Join(wd, "build")), "ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-tinygo:main", "bash", "-c",
 		"wat2wasm --enable-all /build/main.wat -o /build/main.wasm")
 }
 
@@ -136,14 +136,14 @@ wasm2wat --enable-all build/mainopt.wasm -o build/mainopt.wat
 func UpdateLibs() error {
 	libs := []string{"aho-corasick", "libinjection", "re2"}
 	for _, lib := range libs {
-		if err := sh.RunV("docker", "build", "-t", "ghcr.io/anuraaga/coraza-wasm-filter/buildtools-"+lib, filepath.Join("buildtools", lib)); err != nil {
+		if err := sh.RunV("docker", "build", "-t", "ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-"+lib, filepath.Join("buildtools", lib)); err != nil {
 			return err
 		}
 		wd, err := os.Getwd()
 		if err != nil {
 			return err
 		}
-		if err := sh.RunV("docker", "run", "-it", "--rm", "-v", fmt.Sprintf("%s:/out", filepath.Join(wd, "lib")), "ghcr.io/anuraaga/coraza-wasm-filter/buildtools-"+lib); err != nil {
+		if err := sh.RunV("docker", "run", "-it", "--rm", "-v", fmt.Sprintf("%s:/out", filepath.Join(wd, "lib")), "ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-"+lib); err != nil {
 			return err
 		}
 	}