diff --git a/vendor/lowrisc_common_ifs.lock.hjson b/vendor/lowrisc_common_ifs.lock.hjson
deleted file mode 100644
index 03b44c17..00000000
--- a/vendor/lowrisc_common_ifs.lock.hjson
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-
-// This file is generated by the util/vendor script. Please do not modify it
-// manually.
-
-{
-  upstream:
-  {
-    url: https://github.com/lowRISC/opentitan
-    rev: 249b4c316cd6626d13e17edd8a52ca60c004af96
-    only_subdir: hw/dv/sv/common_ifs
-  }
-}
diff --git a/vendor/lowrisc_common_ifs.vendor.hjson b/vendor/lowrisc_common_ifs.vendor.hjson
deleted file mode 100644
index 647e5212..00000000
--- a/vendor/lowrisc_common_ifs.vendor.hjson
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-{
-  name: "common_ifs",
-  target_dir: "lowrisc_ip/common_ifs",
-
-  upstream: {
-    url: "https://github.com/lowRISC/opentitan"
-    rev: "master"
-    only_subdir: "hw/dv/sv/common_ifs"
-  }
-}
diff --git a/vendor/lowrisc_csr_utils.lock.hjson b/vendor/lowrisc_csr_utils.lock.hjson
deleted file mode 100644
index eeef384f..00000000
--- a/vendor/lowrisc_csr_utils.lock.hjson
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-
-// This file is generated by the util/vendor script. Please do not modify it
-// manually.
-
-{
-  upstream:
-  {
-    url: https://github.com/lowRISC/opentitan
-    rev: 249b4c316cd6626d13e17edd8a52ca60c004af96
-    only_subdir: hw/dv/sv/csr_utils
-  }
-}
diff --git a/vendor/lowrisc_csr_utils.vendor.hjson b/vendor/lowrisc_csr_utils.vendor.hjson
deleted file mode 100644
index 015c0738..00000000
--- a/vendor/lowrisc_csr_utils.vendor.hjson
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-{
-  name: "csr_utils",
-  target_dir: "lowrisc_ip/csr_utils",
-
-  upstream: {
-    url: "https://github.com/lowRISC/opentitan"
-    rev: "master"
-    only_subdir: "hw/dv/sv/csr_utils"
-  }
-}
diff --git a/vendor/lowrisc_dv_lib.lock.hjson b/vendor/lowrisc_dv_lib.lock.hjson
deleted file mode 100644
index e7196a8e..00000000
--- a/vendor/lowrisc_dv_lib.lock.hjson
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-
-// This file is generated by the util/vendor script. Please do not modify it
-// manually.
-
-{
-  upstream:
-  {
-    url: https://github.com/lowRISC/opentitan
-    rev: 249b4c316cd6626d13e17edd8a52ca60c004af96
-    only_subdir: hw/dv/sv/dv_lib
-  }
-}
diff --git a/vendor/lowrisc_dv_lib.vendor.hjson b/vendor/lowrisc_dv_lib.vendor.hjson
deleted file mode 100644
index adafe411..00000000
--- a/vendor/lowrisc_dv_lib.vendor.hjson
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-{
-  name: "dv_lib",
-  target_dir: "lowrisc_ip/dv_lib",
-
-  upstream: {
-    url: "https://github.com/lowRISC/opentitan"
-    rev: "master"
-    only_subdir: "hw/dv/sv/dv_lib"
-  }
-}
diff --git a/vendor/lowrisc_dv_utils.lock.hjson b/vendor/lowrisc_dv_utils.lock.hjson
deleted file mode 100644
index 9bfc71be..00000000
--- a/vendor/lowrisc_dv_utils.lock.hjson
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-
-// This file is generated by the util/vendor script. Please do not modify it
-// manually.
-
-{
-  upstream:
-  {
-    url: https://github.com/lowRISC/opentitan
-    rev: 249b4c316cd6626d13e17edd8a52ca60c004af96
-    only_subdir: hw/dv/sv/dv_utils
-  }
-}
diff --git a/vendor/lowrisc_dv_utils.vendor.hjson b/vendor/lowrisc_dv_utils.vendor.hjson
deleted file mode 100644
index 8fb2fc15..00000000
--- a/vendor/lowrisc_dv_utils.vendor.hjson
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-{
-  name: "dv_utils",
-  target_dir: "lowrisc_ip/dv_utils",
-  patch_dir: "patches/lowrisc_dv_utils",
-
-  upstream: {
-    url: "https://github.com/lowRISC/opentitan"
-    rev: "master"
-    only_subdir: "hw/dv/sv/dv_utils"
-  }
-}
diff --git a/vendor/lowrisc_dvsim.lock.hjson b/vendor/lowrisc_dvsim.lock.hjson
deleted file mode 100644
index 4057964a..00000000
--- a/vendor/lowrisc_dvsim.lock.hjson
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-
-// This file is generated by the util/vendor script. Please do not modify it
-// manually.
-
-{
-  upstream:
-  {
-    url: https://github.com/lowRISC/opentitan
-    rev: 249b4c316cd6626d13e17edd8a52ca60c004af96
-    only_subdir: util/dvsim
-  }
-}
diff --git a/vendor/lowrisc_dvsim.vendor.hjson b/vendor/lowrisc_dvsim.vendor.hjson
deleted file mode 100644
index 3d316460..00000000
--- a/vendor/lowrisc_dvsim.vendor.hjson
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-{
-  name: "dvsim",
-  target_dir: "lowrisc_ip/dvsim",
-
-  upstream: {
-    url: "https://github.com/lowRISC/opentitan"
-    rev: "master"
-    only_subdir: "util/dvsim"
-  }
-}
diff --git a/vendor/lowrisc_ip.vendor.hjson b/vendor/lowrisc_ip.vendor.hjson
new file mode 100644
index 00000000..b1e1eb27
--- /dev/null
+++ b/vendor/lowrisc_ip.vendor.hjson
@@ -0,0 +1,22 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+{
+    name: "lowrisc_ip",
+    target_dir: "lowrisc_ip",
+
+    upstream: {
+        url: "https://github.com/lowRISC/opentitan"
+        rev: "master"
+    }
+
+    mapping: [
+        {from: "hw/dv/sv/common_ifs", to: "common_ifs"},
+        {from: "hw/dv/sv/csr_utils",  to: "csr_utils"},
+        {from: "hw/dv/sv/dv_lib",     to: "dv_lib"},
+        {from: "hw/dv/sv/dv_utils",   to: "dv_utils"},
+
+        {from: "util/dvsim",          to: "dvsim"},
+        {from: "util/uvmdvgen",       to: "uvmdvgen"}
+    ]
+}
diff --git a/vendor/lowrisc_uvmdvgen.lock.hjson b/vendor/lowrisc_uvmdvgen.lock.hjson
deleted file mode 100644
index 30e7773c..00000000
--- a/vendor/lowrisc_uvmdvgen.lock.hjson
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-
-// This file is generated by the util/vendor script. Please do not modify it
-// manually.
-
-{
-  upstream:
-  {
-    url: https://github.com/lowRISC/opentitan
-    rev: 249b4c316cd6626d13e17edd8a52ca60c004af96
-    only_subdir: util/uvmdvgen
-  }
-}
diff --git a/vendor/lowrisc_uvmdvgen.vendor.hjson b/vendor/lowrisc_uvmdvgen.vendor.hjson
deleted file mode 100644
index 59eff14d..00000000
--- a/vendor/lowrisc_uvmdvgen.vendor.hjson
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-{
-  name: "uvmdvgen",
-  target_dir: "lowrisc_ip/uvmdvgen",
-
-  upstream: {
-    url: "https://github.com/lowRISC/opentitan"
-    rev: "master"
-    only_subdir: "util/uvmdvgen"
-  }
-}