diff --git a/packages/dns-discovery/package.json b/packages/dns-discovery/package.json
index 9b35af0419..10a3fd0f05 100644
--- a/packages/dns-discovery/package.json
+++ b/packages/dns-discovery/package.json
@@ -186,9 +186,7 @@
   "files": [
     "dist",
     "bundle",
-    "src/*.ts",
-    "src/lib/**/*.ts",
-    "src/proto/**/*.ts",
+    "src/**/*.ts",
     "!**/*.spec.*",
     "!**/*.json",
     "CHANGELOG.md",
diff --git a/packages/dns-discovery/src/enrtree.ts b/packages/dns-discovery/src/enrtree.ts
index a1fdbe9fc1..a2b1347b91 100644
--- a/packages/dns-discovery/src/enrtree.ts
+++ b/packages/dns-discovery/src/enrtree.ts
@@ -1,6 +1,6 @@
 import { utf8ToBytes } from "@waku/byte-utils";
 import { ENR } from "@waku/enr";
-import { keccak256, verifySignature } from "@waku/enr/crypt";
+import { keccak256, verifySignature } from "@waku/enr";
 import base32 from "hi-base32";
 import { fromString } from "uint8arrays/from-string";
 
diff --git a/packages/enr/package.json b/packages/enr/package.json
index a45aee339e..cda56c7cd2 100644
--- a/packages/enr/package.json
+++ b/packages/enr/package.json
@@ -8,10 +8,6 @@
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
-    },
-    "./crypt": {
-      "types": "./dist/crypto.d.ts",
-      "import": "./dist/crypto.js"
     }
   },
   "type": "module",
@@ -185,9 +181,7 @@
   "files": [
     "dist",
     "bundle",
-    "src/*.ts",
-    "src/lib/**/*.ts",
-    "src/proto/**/*.ts",
+    "src/**/*.ts",
     "!**/*.spec.*",
     "!**/*.json",
     "CHANGELOG.md",
diff --git a/packages/enr/rollup.config.js b/packages/enr/rollup.config.js
index 99f3643c0c..d22d3d231e 100644
--- a/packages/enr/rollup.config.js
+++ b/packages/enr/rollup.config.js
@@ -5,7 +5,6 @@ import { nodeResolve } from "@rollup/plugin-node-resolve";
 export default {
   input: {
     index: "dist/index.js",
-    crypto: "dist/crypto.js",
   },
   output: {
     dir: "bundle",
diff --git a/packages/enr/src/index.ts b/packages/enr/src/index.ts
index b1b0ba86e3..aca5cf3955 100644
--- a/packages/enr/src/index.ts
+++ b/packages/enr/src/index.ts
@@ -3,3 +3,4 @@ export * from "./enr.js";
 export * from "./types.js";
 export * from "./keypair/index.js";
 export * from "./waku2_codec.js";
+export * from "./crypto.js";