diff --git a/apps/summon-safe/src/utils/modules.ts b/apps/summon-safe/src/utils/modules.ts
index d69910e8..78e76a9a 100644
--- a/apps/summon-safe/src/utils/modules.ts
+++ b/apps/summon-safe/src/utils/modules.ts
@@ -26,17 +26,22 @@ export const MODULES: Record<string, ModuleTemplate> = {
       '0x1': {},
       '0x5': {
         moduleFactory: {
-          address: '0x3D65060def34B7b09f3be8f1eDD826B278540201',
-          singletonAddress: '0x11cf91a633b292e90afc1dd063dB9CE0b94a89aE',
+          address: '0x8f60853B55847d91331106acc303F4A8676efc8B',
+          singletonAddress: '0x30b3Ac0e403e5102c9f0097E9c65f09E5AaF810c',
         },
       },
       '0x64': {
         moduleFactory: {
-          address: '0xD8f6FE1E102a05Eae8ab70290Dc410f80FdA3a8D',
-          singletonAddress: '0x7dd7E6AF7Ff624EF6caf2d977E339209D2A5503A',
+          address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
+          singletonAddress: '0x7c1Db931F804271E39b04E68221b71Ca94E9AFa5',
+        },
+      },
+      '0xa': {
+        moduleFactory: {
+          address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
+          singletonAddress: '0x7c1Db931F804271E39b04E68221b71Ca94E9AFa5',
         },
       },
-      '0xa': {},
       '0x89': {},
       '0xa4b1': {},
     },
@@ -155,17 +160,22 @@ export const MODULES: Record<string, ModuleTemplate> = {
       '0x1': {},
       '0x5': {
         moduleFactory: {
-          address: '0x3D65060def34B7b09f3be8f1eDD826B278540201',
-          singletonAddress: '0x478b6d99EfA2689649762a4B4E2590872184078f',
+          address: '0x8f60853B55847d91331106acc303F4A8676efc8B',
+          singletonAddress: '0x6a2580B166b7132042cCcABa1Fe554fd67440597',
         },
       },
       '0x64': {
         moduleFactory: {
-          address: '0xD8f6FE1E102a05Eae8ab70290Dc410f80FdA3a8D',
-          singletonAddress: '0xFCC2d698C614743FD17f628921874e8Eac3D538F',
+          address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
+          singletonAddress: '0x85C60D0674e161B7f9d1d40A2A46e4b788E7F057',
+        },
+      },
+      '0xa': {
+        moduleFactory: {
+          address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
+          singletonAddress: '0x85C60D0674e161B7f9d1d40A2A46e4b788E7F057',
         },
       },
-      '0xa': {},
       '0x89': {},
       '0xa4b1': {},
     },
@@ -235,17 +245,22 @@ export const MODULES: Record<string, ModuleTemplate> = {
       '0x1': {},
       '0x5': {
         moduleFactory: {
-          address: '0x3D65060def34B7b09f3be8f1eDD826B278540201',
-          singletonAddress: '0x7dd7E6AF7Ff624EF6caf2d977E339209D2A5503A',
+          address: '0x8f60853B55847d91331106acc303F4A8676efc8B',
+          singletonAddress: '0xf3219beFA8d7ae465fbb0DD227F706972943a84E',
         },
       },
       '0x64': {
         moduleFactory: {
-          address: '0xD8f6FE1E102a05Eae8ab70290Dc410f80FdA3a8D',
-          singletonAddress: '0x926542695E047463f25aa3Df7e78Ade57495808A',
+          address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
+          singletonAddress: '0x15f06a6dB8eC8D79Eaa49659210C1c58975a4056',
+        },
+      },
+      '0xa': {
+        moduleFactory: {
+          address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
+          singletonAddress: '0x15f06a6dB8eC8D79Eaa49659210C1c58975a4056',
         },
       },
-      '0xa': {},
       '0x89': {},
       '0xa4b1': {},
     },
@@ -308,17 +323,22 @@ export const MODULES: Record<string, ModuleTemplate> = {
       '0x1': {},
       '0x5': {
         moduleFactory: {
-          address: '0x3D65060def34B7b09f3be8f1eDD826B278540201',
-          singletonAddress: '0xFCC2d698C614743FD17f628921874e8Eac3D538F',
+          address: '0x8f60853B55847d91331106acc303F4A8676efc8B',
+          singletonAddress: '0x92c82e6DFd97e54c5f22bE866b863Ce71f26373f',
         },
       },
       '0x64': {
         moduleFactory: {
-          address: '0xD8f6FE1E102a05Eae8ab70290Dc410f80FdA3a8D',
-          singletonAddress: '0x3D65060def34B7b09f3be8f1eDD826B278540201',
+          address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
+          singletonAddress: '0x226E0601aa8b8CC34519c76Be00A7a6a8a4d97d2',
+        },
+      },
+      '0xa': {
+        moduleFactory: {
+          address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
+          singletonAddress: '0x226E0601aa8b8CC34519c76Be00A7a6a8a4d97d2',
         },
       },
-      '0xa': {},
       '0x89': {},
       '0xa4b1': {},
     },
@@ -377,17 +397,22 @@ export const MODULES: Record<string, ModuleTemplate> = {
       '0x1': {},
       '0x5': {
         moduleFactory: {
-          address: '0x3D65060def34B7b09f3be8f1eDD826B278540201',
-          singletonAddress: '0x926542695E047463f25aa3Df7e78Ade57495808A',
+          address: '0x8f60853B55847d91331106acc303F4A8676efc8B',
+          singletonAddress: '0x5BeFFF7186811b49d29B5565B161Ea7e3d890CC8',
         },
       },
       '0x64': {
         moduleFactory: {
-          address: '0xD8f6FE1E102a05Eae8ab70290Dc410f80FdA3a8D',
-          singletonAddress: '0x0904DA589227e1c9f318D9581756c331f62ACd98',
+          address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
+          singletonAddress: '0x0C7F0fC0ddb95d7099ED97c10A2DE549c03E39F9',
+        },
+      },
+      '0xa': {
+        moduleFactory: {
+          address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
+          singletonAddress: '0x0C7F0fC0ddb95d7099ED97c10A2DE549c03E39F9',
         },
       },
-      '0xa': {},
       '0x89': {},
       '0xa4b1': {},
     },