diff --git a/Bender.lock b/Bender.lock
index 42fb0d16..aed94e7b 100644
--- a/Bender.lock
+++ b/Bender.lock
@@ -103,10 +103,10 @@ packages:
       Git: https://github.com/pulp-platform/common_verification.git
     dependencies: []
   cva6:
-    revision: 2240a61da2cdccf38e2aa932a19180d6faa7a31d
+    revision: 99ae53bde1a94b90c1d9bbbe7fe272a9336200a6
     version: null
     source:
-      Git: https://github.com/mp-17/cva6.git
+      Git: https://github.com/pulp-platform/cva6.git
     dependencies:
     - axi
     - common_cells
diff --git a/Bender.yml b/Bender.yml
index 3e3f7da3..d17ae8d0 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -22,7 +22,7 @@ dependencies:
   clint:                    { git: "https://github.com/pulp-platform/clint.git",                  version: 0.2.0  }
   common_cells:             { git: "https://github.com/pulp-platform/common_cells.git",           version: 1.33.0 }
   common_verification:      { git: "https://github.com/pulp-platform/common_verification.git",    version: 0.2.0  }
-  cva6:                     { git: "https://github.com/mp-17/cva6.git",                           rev: mp/pulp-v1 }
+  cva6:                     { git: "https://github.com/pulp-platform/cva6.git",                   rev: pulp-v1    }
   ara:                      { git: "https://github.com/mp-17/ara.git",                            rev: mp/cva6-pulpv1/rebase }
   iDMA:                     { git: "https://github.com/pulp-platform/iDMA.git",                   version: 0.5.1  }
   irq_router:               { git: "https://github.com/pulp-platform/irq_router.git",             version: 0.0.1-beta.1 }