diff --git a/Bender.lock b/Bender.lock
index af76c6177..aa3b42b6b 100644
--- a/Bender.lock
+++ b/Bender.lock
@@ -1,4 +1,3 @@
----
 packages:
   apb:
     revision: 77ddf073f194d44b9119949d2421be59789e69ae
@@ -22,8 +21,8 @@ packages:
     source:
       Git: https://github.com/pulp-platform/common_cells.git
     dependencies:
-      - common_verification
-      - tech_cells_generic
+    - common_verification
+    - tech_cells_generic
   common_verification:
     revision: 9c07fa860593b2caabd9b5681740c25fac04b878
     version: 0.2.3
@@ -31,34 +30,34 @@ packages:
       Git: https://github.com/pulp-platform/common_verification.git
     dependencies: []
   cva6:
-    revision: 5e2e520696aa63545b91fca38ce340314291be5c
-    version: ~
+    revision: e0dbbbf1a82377ae6db19d2e1ac87bddfdf5052a
+    version: null
     source:
-      Git: "https://github.com/MaistoV/cva6_fork.git"
+      Git: https://github.com/mp-17/cva6.git
     dependencies:
-      - axi
-      - common_cells
-      - fpnew
-      - tech_cells_generic
+    - axi
+    - common_cells
+    - fpnew
+    - tech_cells_generic
   fpnew:
     revision: f231041c610f270ffc03cbdac38739ddb6426572
     version: null
     source:
-      Git: "https://github.com/openhwgroup/cvfpu.git"
+      Git: https://github.com/pulp-platform/cvfpu.git
     dependencies:
-      - common_cells
-      - fpu_div_sqrt_mvp
+    - common_cells
+    - fpu_div_sqrt_mvp
   fpu_div_sqrt_mvp:
     revision: 86e1f558b3c95e91577c41b2fc452c86b04e85ac
     version: 1.0.4
     source:
-      Git: "https://github.com/pulp-platform/fpu_div_sqrt_mvp.git"
+      Git: https://github.com/pulp-platform/fpu_div_sqrt_mvp.git
     dependencies:
-      - common_cells
+    - common_cells
   tech_cells_generic:
     revision: 7968dd6e6180df2c644636bc6d2908a49f2190cf
     version: 0.2.13
     source:
       Git: https://github.com/pulp-platform/tech_cells_generic.git
     dependencies:
-      - common_verification
\ No newline at end of file
+    - common_verification
diff --git a/Bender.yml b/Bender.yml
index 23f667f02..a1f303ab6 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -10,7 +10,7 @@ package:
 dependencies:
   axi:                { git: "https://github.com/pulp-platform/axi.git",                version: 0.39.1                               }
   common_cells:       { git: "https://github.com/pulp-platform/common_cells.git",       version: 1.22.1                               }
-  cva6:               { git: "https://github.com/mp-17/cva6.git",                       rev: ea86d0ac5fe23ac7889cf8a8b8df7a8c0813bfad } # rebase/pulp-v1-os
+  cva6:               { git: "https://github.com/mp-17/cva6.git",                       rev: e0dbbbf1a82377ae6db19d2e1ac87bddfdf5052a } # rebase/pulp-v1-os
   tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.13                               }
   apb:                { git: "https://github.com/pulp-platform/apb.git",                version: 0.2.4                                }