diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 932efd6d..e2b005b3 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -16,13 +16,7 @@ jobs:
           node-version: 20.x
       - run: cp .env.example .env
       - run: npm ci --include=optional
-      - run: mkdir node_modules/fhevm-core-contracts/addresses
-      - run: source .env && npx hardhat task:computeGatewayAddress --private-key $PRIVATE_KEY_GATEWAY_DEPLOYER
-      - run: source .env && npx hardhat task:computeACLAddress --private-key $PRIVATE_KEY_FHEVM_DEPLOYER
-      - run: source .env && npx hardhat task:computeTFHEExecutorAddress --private-key $PRIVATE_KEY_FHEVM_DEPLOYER
-      - run: source .env && npx hardhat task:computeKMSVerifierAddress --private-key $PRIVATE_KEY_FHEVM_DEPLOYER
-      - run: source .env && npx hardhat task:computeInputVerifierAddress --private-key $PRIVATE_KEY_FHEVM_DEPLOYER --use-address false
-      - run: source .env && npx hardhat task:computeFHEGasLimitAddress --private-key $PRIVATE_KEY_FHEVM_DEPLOYER
+      - run: HARDHAT_TFHEEXECUTOR_EVENTS=1 npx hardhat test test/encryptedERC20/EncryptedERC20.ts --network hardhat
       - run: npm run compile
       - uses: JS-DevTools/npm-publish@19c28f1ef146469e409470805ea4279d47c3d35c # v3.1.1
         with:
diff --git a/.github/workflows/publishprerelease.yml b/.github/workflows/publishprerelease.yml
index b52e624d..802545df 100644
--- a/.github/workflows/publishprerelease.yml
+++ b/.github/workflows/publishprerelease.yml
@@ -16,13 +16,7 @@ jobs:
           node-version: 20.x
       - run: cp .env.example .env
       - run: npm ci --include=optional
-      - run: mkdir node_modules/fhevm-core-contracts/addresses
-      - run: source .env && npx hardhat task:computeGatewayAddress --private-key $PRIVATE_KEY_GATEWAY_DEPLOYER
-      - run: source .env && npx hardhat task:computeACLAddress --private-key $PRIVATE_KEY_FHEVM_DEPLOYER
-      - run: source .env && npx hardhat task:computeTFHEExecutorAddress --private-key $PRIVATE_KEY_FHEVM_DEPLOYER
-      - run: source .env && npx hardhat task:computeKMSVerifierAddress --private-key $PRIVATE_KEY_FHEVM_DEPLOYER
-      - run: source .env && npx hardhat task:computeInputVerifierAddress --private-key $PRIVATE_KEY_FHEVM_DEPLOYER --use-address false
-      - run: source .env && npx hardhat task:computeFHEGasLimitAddress --private-key $PRIVATE_KEY_FHEVM_DEPLOYER
+      - run: HARDHAT_TFHEEXECUTOR_EVENTS=1 npx hardhat test test/encryptedERC20/EncryptedERC20.ts --network hardhat
       - run: npm run compile
       - uses: JS-DevTools/npm-publish@19c28f1ef146469e409470805ea4279d47c3d35c # v3.1.1
         with:
diff --git a/docs/getting_started/repositories.md b/docs/getting_started/repositories.md
index a63688eb..bbed917d 100644
--- a/docs/getting_started/repositories.md
+++ b/docs/getting_started/repositories.md
@@ -40,10 +40,9 @@ Access the essential libraries for building and integrating FHE-enabled applicat
 
 Explore the foundational implementations enabling FHE integration with blockchain systems:
 
-| **Repository**                                                 | **Description**                                    |
-| -------------------------------------------------------------- | -------------------------------------------------- |
-| [fhevm-go](https://github.com/zama-ai/fhevm-go/)               | Go implementation of the FHE Virtual Machine       |
-| [go-ethereum](https://github.com/zama-ai/go-ethereum)          | Fork of go-ethereum v1.10.19 with FHE capabilities |
-| [zbc-go-ethereum](https://github.com/zama-ai/zbc-go-ethereum/) | Modified go-ethereum with enhanced FHE support     |
+| **Repository**                                                 | **Description**                                |
+| -------------------------------------------------------------- | ---------------------------------------------- |
+| [fhevm-go](https://github.com/zama-ai/fhevm-go/)               | Go implementation of the FHE Virtual Machine   |
+| [zbc-go-ethereum](https://github.com/zama-ai/zbc-go-ethereum/) | Modified go-ethereum with enhanced FHE support |
 
 Use these repositories to accelerate your development, integrate FHE into your applications, or contribute to the growing ecosystem.