diff --git a/packages/did-comm/package.json b/packages/did-comm/package.json
index 1b01a380a..3f8c29fd3 100644
--- a/packages/did-comm/package.json
+++ b/packages/did-comm/package.json
@@ -26,7 +26,7 @@
     "@veramo/core-types": "workspace:^",
     "@veramo/message-handler": "workspace:^",
     "@veramo/utils": "workspace:^",
-    "kv-store": "^0.0.1",
+    "@veramo/kv-store": "workspace:^",
     "cross-fetch": "^4.0.0",
     "debug": "^4.3.3",
     "did-jwt": "^7.4.1",
diff --git a/packages/did-comm/src/__tests__/coordinate-mediation-v3-message-handler.test.ts b/packages/did-comm/src/__tests__/coordinate-mediation-v3-message-handler.test.ts
index d24004098..554d5d126 100644
--- a/packages/did-comm/src/__tests__/coordinate-mediation-v3-message-handler.test.ts
+++ b/packages/did-comm/src/__tests__/coordinate-mediation-v3-message-handler.test.ts
@@ -4,7 +4,7 @@ import {
   KeyValueTypeORMStoreAdapter,
   Entities as KVStoreEntities,
   kvStoreMigrations,
-} from '../../../kv-store/src'
+} from '@veramo/kv-store'
 import {
   createAgent,
   RequesterDid,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 24192b5c4..b5cab2f56 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -670,6 +670,9 @@ importers:
       '@veramo/core-types':
         specifier: workspace:^
         version: link:../core-types
+      '@veramo/kv-store':
+        specifier: workspace:^
+        version: link:../kv-store
       '@veramo/message-handler':
         specifier: workspace:^
         version: link:../message-handler
@@ -691,9 +694,6 @@ importers:
       isomorphic-webcrypto:
         specifier: ^2.3.8
         version: 2.3.8(expo@49.0.6)(react-native@0.72.3)
-      kv-store:
-        specifier: ^0.0.1
-        version: 0.0.1
       uuid:
         specifier: ^9.0.0
         version: 9.0.0
@@ -1114,9 +1114,6 @@ importers:
       '@veramo/core-types':
         specifier: workspace:*
         version: link:../core-types
-      '@veramo/kv-store':
-        specifier: workspace:*
-        version: 'link:'
       '@veramo/utils':
         specifier: workspace:*
         version: link:../utils
@@ -18036,10 +18033,6 @@ packages:
     engines: {node: '>= 8'}
     dev: true
 
-  /kv-store@0.0.1:
-    resolution: {integrity: sha512-onaSnV841kZfwxwImAjybQMg1SMcSrjlTftW3mr85Wug9cTu0mhg8S1rA7uiK+24uUYZ5PepaZs5KoF9cdJGIg==}
-    dev: false
-
   /ky-universal@0.8.2(ky@0.25.1):
     resolution: {integrity: sha512-xe0JaOH9QeYxdyGLnzUOVGK4Z6FGvDVzcXFTdrYA1f33MZdEa45sUDaMBy98xQMcsd2XIBrTXRrRYnegcSdgVQ==}
     engines: {node: '>=10.17'}