diff --git a/apps/cli/src/baseCommand.ts b/apps/cli/src/baseCommand.ts
index 3ec26f18..2e66397e 100644
--- a/apps/cli/src/baseCommand.ts
+++ b/apps/cli/src/baseCommand.ts
@@ -88,13 +88,21 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
             AuthorityHistoryPairFactory: authorityHistoryPairFactoryAddress,
             CartesiDAppFactory: cartesiDAppFactoryAddress,
             DAppAddressRelay: dAppAddressRelayAddress,
+            EntryPointV06: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789",
+            EntryPointV07: "0x0000000071727De22E5E9d8BAf0edAc6f37da032",
             ERC1155BatchPortal: erc1155BatchPortalAddress,
             ERC1155SinglePortal: erc1155SinglePortalAddress,
             ERC20Portal: erc20PortalAddress,
             ERC721Portal: erc721PortalAddress,
             EtherPortal: etherPortalAddress,
             InputBox: inputBoxAddress,
+            LightAccountFactory: "0x00004EC70002a32400f8ae005A26081065620D20",
             SelfHostedApplicationFactory: selfHostedApplicationFactoryAddress,
+            SimpleAccountFactory: "0x9406Cc6185a346906296840746125a0E44976454",
+            SmartAccountFactory: "0x000000a56Aaca3e9a4C479ea6b6CD0DbcB6634F5",
+            KernelFactoryV2: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3",
+            KernelFactoryV3: "0x6723b44Abeec4E71eBE3232BD5B455805baDD22f",
+            KernelFactoryV3_1: "0xaac5D4240AF87249B3f71BC8E4A2cae074A3E419",
             TestToken: testTokenAddress,
             TestNFT: testNftAddress,
             TestMultiToken: testMultiTokenAddress,