diff --git a/Pipfile b/Pipfile
index 1c5db818..30847371 100644
--- a/Pipfile
+++ b/Pipfile
@@ -10,12 +10,12 @@ sphinx = ">=4.5"
 isort = "<6.0" # Unpin when isort==6.0.0 is released
 
 [packages]
-invenio-app-rdm = {version = "~=12.0.0b2.dev72", extras = ["opensearch2"]}
+invenio-app-rdm = {version = "~=12.0.0b3.dev1", extras = ["opensearch2"]}
 invenio-logging = {extras = ["sentry_sdk"], version = "~=2.0"}
 zenodo_rdm = {editable="True", path="./site"}
 zenodo_legacy = {editable="True", path="./legacy"}
 # TODO: Remove once we fix PyPI package issues
-invenio-swh = {git = "https://github.com/inveniosoftware/invenio-swh", ref = "v0.5.0"}
+invenio-swh = {git = "https://github.com/inveniosoftware/invenio-swh", ref = "v0.6.0"}
 jsonschema = ">=4.17.0,<4.18.0" # due to compatibility issues with alpha
 ipython = "!=8.1.0"
 uwsgi = ">=2.0"
diff --git a/Pipfile.lock b/Pipfile.lock
index 6c4cf5b4..6fd78fb2 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "8a3c368d086a0b0c848836658d483a317ceb575c5c0e572847641393d20e6321"
+            "sha256": "6fba728b525dd43f0f78e771d6d13ab970dae4bfc66ade9042c664c263a85f3f"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -766,10 +766,11 @@
         },
         "future": {
             "hashes": [
-                "sha256:34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307"
+                "sha256:929292d34f5872e70396626ef385ec22355a1fae8ad29e1a734c3e43f9fbc216",
+                "sha256:bd2968309307861edae1458a4f8a4f3598c03be43b97521076aebf5d94c07b05"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'",
-            "version": "==0.18.3"
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==1.0.0"
         },
         "geojson": {
             "hashes": [
@@ -979,11 +980,11 @@
                 "opensearch2"
             ],
             "hashes": [
-                "sha256:051fcf43e0a0eff38eea47cd3590b68d570831931b31461f058aaa337411b7c3",
-                "sha256:6316888dcb32a3ca724c920e0a9d6166f083badcdb4ebcef72945046d9c2a5e4"
+                "sha256:3bad60a77428d847ddd965087f844be4967d658b4de4a178d9d07c5639e641d5",
+                "sha256:a97dbdc19502a9c6a88ae1e2822109033b4f04b8a850a0a5f510d1c171f99638"
             ],
-            "index": "pypi",
-            "version": "==12.0.0b2.dev73"
+            "markers": "python_version >= '3.7'",
+            "version": "==12.0.0b3.dev1"
         },
         "invenio-assets": {
             "hashes": [
@@ -995,11 +996,11 @@
         },
         "invenio-banners": {
             "hashes": [
-                "sha256:71df32bb0da36d95832e7f5902a92710370f290eca45afeef1aef9ae758e971b",
-                "sha256:bab1f2e49374d2a8f1cb1b5f76899461295273955d490bc20a9bec69dff6e2c2"
+                "sha256:bc22495c74d12fdc4339c926937803479d197656933e02c0b55a172fe4c7dc3d",
+                "sha256:c34c240fbe2255d50c4727e7026473e17e759bd19c4b53143cbfb4f5ffc69679"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==3.0.0"
+            "version": "==3.0.1"
         },
         "invenio-base": {
             "hashes": [
@@ -1027,11 +1028,11 @@
         },
         "invenio-communities": {
             "hashes": [
-                "sha256:386495d6c15d794991c437a11e5a5ac5b56de0c22206b9db835aaa9f94383f45",
-                "sha256:e75c6d92cfcb219ec9bc7ad8c0ba0901e262fe83d85c507bd6690fbe5934c7ca"
+                "sha256:4a6e8232369bdf2b7ad3e059e5fc543ecee13b633a80fefd8235ef980b0341d5",
+                "sha256:e13b3f2d4c0a01faf5f79c545abda93a97b98bff44c4904a2bf05e8f1f8c45dc"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==11.1.1"
+            "version": "==12.0.0"
         },
         "invenio-config": {
             "hashes": [
@@ -1042,6 +1043,10 @@
             "version": "==1.0.4"
         },
         "invenio-db": {
+            "extras": [
+                "mysql",
+                "postgresql"
+            ],
             "hashes": [
                 "sha256:c02120e22d22498fcd23c3761a1d160c177261c760c38ccfddb4d671fcb7ddef",
                 "sha256:cbbe6d53678a04e21afd8220498a9ddde041bf5c7afd66df00fb46907b109c13"
@@ -1112,7 +1117,7 @@
                 "sha256:2b3d849f32f9bfd1aa636d951d952b6df2fa2b85a350080dd5a90e3ff7e56592",
                 "sha256:7537b9902171517208552893eea3efb76fb3b55558671ea4ea6fd218d4fbc89b"
             ],
-            "index": "pypi",
+            "markers": "python_version >= '3.8'",
             "version": "==2.1.0"
         },
         "invenio-mail": {
@@ -1157,11 +1162,11 @@
         },
         "invenio-pages": {
             "hashes": [
-                "sha256:03c08a14fafd9a321557aa58e6313dede25a3828a0934fd0568842d5a8a79138",
-                "sha256:55894609ac4ef32e6072bbd40cd5573ce699bf9a6415bb1b7927452b835aaf5f"
+                "sha256:296e37cba0d8cfdbfddf9bcf175660018c7ca5b36f976f9674a14d6876a678c8",
+                "sha256:bdd75141a6240979b9a2257f3541b1b4bae951d0fd7b80bf3f8dd61963bf71f1"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==3.2.0"
+            "version": "==3.3.0"
         },
         "invenio-pidstore": {
             "hashes": [
@@ -1189,11 +1194,11 @@
         },
         "invenio-rdm-records": {
             "hashes": [
-                "sha256:17a1a9905605763d209436118c6bc5879ee76614521fce7a337e97fc96c780f7",
-                "sha256:6f101d5cb4ba2f7b7c1f56bfa1bbb5ce4688b89c30ebfb59da3bfe1bb05941c5"
+                "sha256:59dc9850fc16bd0988ce9a2e00584ac9274140ed17f495a8e3b170793607b33a",
+                "sha256:c5e9a4a02f9aa49691af01c03b1d3d64d1b1598bd3778a3dbf05b3495a7c7aff"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==7.1.1"
+            "version": "==8.0.0"
         },
         "invenio-records": {
             "hashes": [
@@ -1243,11 +1248,11 @@
         },
         "invenio-requests": {
             "hashes": [
-                "sha256:22e82c2c3403a76426f2f193e20d7e2f69d4a92271fb03d44b676459af74f0bc",
-                "sha256:286b430b8c87602400f5a692e30ac873bac16f4a2204160b0c108e20d676a749"
+                "sha256:14554d8fc2acd7623c497f03be19af2ace56067831e2e8f89087e556b403e747",
+                "sha256:a329a5a631be7156592f418667ffc0c2ede9e8d96b3631378654fadfcae3c5ad"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==3.0.1"
+            "version": "==4.0.0"
         },
         "invenio-rest": {
             "hashes": [
@@ -1285,7 +1290,7 @@
         },
         "invenio-swh": {
             "git": "https://github.com/inveniosoftware/invenio-swh",
-            "ref": "a8f659cbbf05c4dc937291300afd87283734a995"
+            "ref": "5195bc8df6c0dea9a91c5b835715b07a674f04cb"
         },
         "invenio-theme": {
             "hashes": [
@@ -1305,11 +1310,11 @@
         },
         "invenio-users-resources": {
             "hashes": [
-                "sha256:abdb2dce71eda3d2bacf219f51c2b21857c140467fb008e9444b727be2ea0062",
-                "sha256:d9082e3ecc65976946f18ca1d94bac1cc307032e019bdf0d946f90f6a12acde8"
+                "sha256:dec7de8f6878f1b9727c349adf5f597f8c89e589389c8ccbb4a7deaf939a76ea",
+                "sha256:feef1ca879e27f44a2b07d93a118dcdaee425276a1dcce39d3a80287b23f1357"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==4.0.0"
+            "version": "==5.0.2"
         },
         "invenio-vocabularies": {
             "hashes": [
@@ -1333,6 +1338,7 @@
                 "sha256:e8267419d72d81955ec1177f8a29aaa90ac80ad647499201119e2f05e99aa397"
             ],
             "index": "pypi",
+            "markers": "python_version >= '3.9'",
             "version": "==8.18.1"
         },
         "isbnlib": {
@@ -1410,6 +1416,7 @@
                 "sha256:a870ad254da1a8ca84b6a2905cac29d265f805acc57af304784962a2aa6508f6"
             ],
             "index": "pypi",
+            "markers": "python_version >= '3.7'",
             "version": "==4.17.3"
         },
         "jupyter-client": {
@@ -2330,7 +2337,7 @@
                 "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86",
                 "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.8.2"
         },
         "python-geoip": {
@@ -2768,7 +2775,7 @@
                 "sha256:febffa5b1eda6622d44b245b0685aff6fb555ce0ed734e2d7b1c3acd018a2cff",
                 "sha256:ff836cd4041e16003549449cc0a5e372f6b6f871eb89007ab0ee18fb2800fded"
             ],
-            "markers": "python_version >= '2.5' and python_version not in '3.0, 3.1, 3.2'",
+            "markers": "python_version >= '2.5' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==3.19.2"
         },
         "simplekv": {
@@ -2784,7 +2791,7 @@
                 "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
                 "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.16.0"
         },
         "snowballstemmer": {
@@ -3145,7 +3152,7 @@
                 "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
                 "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
             ],
-            "markers": "python_version >= '3.8'",
+            "markers": "python_version >= '3.6'",
             "version": "==2.2.1"
         },
         "uwsgi": {
@@ -3285,11 +3292,11 @@
             "version": "==0.12.0"
         },
         "zenodo-legacy": {
-            "editable": true,
+            "editable": "True",
             "path": "./legacy"
         },
         "zenodo-rdm": {
-            "editable": true,
+            "editable": "True",
             "path": "./site"
         },
         "zipp": {
@@ -3618,6 +3625,7 @@
                 "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"
             ],
             "index": "pypi",
+            "markers": "python_full_version >= '3.8.0'",
             "version": "==5.13.2"
         },
         "itsdangerous": {
@@ -3795,6 +3803,7 @@
                 "sha256:1d339b004f764d6cd0f06e690f6dd748df3d62e6fe1a692d6a5500ac2c5b75a5"
             ],
             "index": "pypi",
+            "markers": "python_version >= '2.7'",
             "version": "==0.3.12"
         },
         "pytest-cov": {
@@ -3819,6 +3828,7 @@
                 "sha256:eda7d69c20d6b7d58f0415e80473ec3f7d1604f00368f46437290051dfdbe216"
             ],
             "index": "pypi",
+            "markers": "python_version >= '3.7'",
             "version": "==2.1.7"
         },
         "pytest-isort": {
@@ -3934,7 +3944,7 @@
                 "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
                 "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'",
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==0.10.2"
         },
         "tomli": {
@@ -3958,7 +3968,7 @@
                 "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
                 "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
             ],
-            "markers": "python_version >= '3.8'",
+            "markers": "python_version >= '3.6'",
             "version": "==2.2.1"
         },
         "werkzeug": {