diff --git a/docker-bake.hcl b/docker-bake.hcl
index 7045d89..55a44d2 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -18,8 +18,8 @@ variable "coraza-version" {
 variable "REPOS" {
     # List of repositories to tag
     default = [
-      #"corazawaf/coraza-crs",
-        "ghcr.io/corazawaf/coraza-crs",
+      #"owasp/coraza-crs",
+        "ghcr.io/coreruleset/coraza-crs",
     ]
 }
 
@@ -65,7 +65,7 @@ target "platforms-base" {
     context="."    
     platforms = ["linux/amd64", "linux/arm/v6", "linux/arm/v7", "linux/arm64"]
     labels = {
-        "org.opencontainers.image.source" = "https://github.com/corazawaf/coraza-crs-docker"
+        "org.opencontainers.image.source" = "https://github.com/coreruleset/coraza-crs-docker"
     }
     args = {
         CRS_VERSION = "${crs-version}"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index e718776..c71d07c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -18,7 +18,7 @@ services:
 
   ## Coraza WAF running on Caddy
   coraza-crs:
-    image: corazawaf/coraza-crs:caddy-alpine
+    image: coreruleset/coraza-crs:caddy-alpine
     depends_on:
       - whoami
     networks: