diff --git a/.github/workflows/credential_manifest.yaml b/.github/workflows/credential_manifest.yaml
index 3a78be899..e87ee708f 100644
--- a/.github/workflows/credential_manifest.yaml
+++ b/.github/workflows/credential_manifest.yaml
@@ -1,13 +1,13 @@
 name: credential_manifest
 
-on: [ pull_request, push ]
+on: [pull_request, push]
 
 jobs:
   build:
     uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
     with:
       flutter_channel: stable
-      flutter_version: 3.19.6
+      flutter_version: 3.22.1
       min_coverage: 30
       working_directory: packages/credential_manifest
-      dart_sdk: 3.3.4
+      dart_sdk: 3.4.1
diff --git a/.github/workflows/cryptocurrency_keys.yaml b/.github/workflows/cryptocurrency_keys.yaml
index 41c60bf47..a0e4f85c8 100644
--- a/.github/workflows/cryptocurrency_keys.yaml
+++ b/.github/workflows/cryptocurrency_keys.yaml
@@ -1,13 +1,13 @@
 name: cryptocurrency_keys
 
-on: [ pull_request, push ]
+on: [pull_request, push]
 
 jobs:
   build:
     uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
     with:
       flutter_channel: stable
-      flutter_version: 3.19.6
+      flutter_version: 3.22.1
       min_coverage: 30
       working_directory: packages/cryptocurrency_keys
-      dart_sdk: 3.3.4
+      dart_sdk: 3.4.1
diff --git a/.github/workflows/did_kit.yaml b/.github/workflows/did_kit.yaml
index b943dd1d6..2647f7254 100644
--- a/.github/workflows/did_kit.yaml
+++ b/.github/workflows/did_kit.yaml
@@ -7,8 +7,8 @@ jobs:
     uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
     with:
       flutter_channel: stable
-      flutter_version: 3.19.6
+      flutter_version: 3.22.1
       min_coverage: 30
       working_directory: packages/did_kit
-      dart_sdk: 3.3.4
+      dart_sdk: 3.4.1
       build_runner: false
diff --git a/.github/workflows/jwt_decode.yaml b/.github/workflows/jwt_decode.yaml
index 9f5dd42f6..aed836c8f 100644
--- a/.github/workflows/jwt_decode.yaml
+++ b/.github/workflows/jwt_decode.yaml
@@ -1,14 +1,14 @@
 name: jwt_decode
 
-on: [ pull_request, push ]
+on: [pull_request, push]
 
 jobs:
   build:
     uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
     with:
       flutter_channel: stable
-      flutter_version: 3.19.6
+      flutter_version: 3.22.1
       min_coverage: 30
       working_directory: packages/jwt_decode
-      dart_sdk: 3.3.4
+      dart_sdk: 3.4.1
       build_runner: false
diff --git a/.github/workflows/key_generator.yaml b/.github/workflows/key_generator.yaml
new file mode 100644
index 000000000..e0f9419df
--- /dev/null
+++ b/.github/workflows/key_generator.yaml
@@ -0,0 +1,14 @@
+name: key_generator
+
+on: [pull_request, push]
+
+jobs:
+  build:
+    uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
+    with:
+      flutter_channel: stable
+      flutter_version: 3.22.1
+      min_coverage: 30
+      working_directory: packages/key_generator
+      dart_sdk: 3.4.1
+      build_runner: false
diff --git a/.github/workflows/polygonid.yaml b/.github/workflows/polygonid.yaml
index 829e4145c..507dffe6e 100644
--- a/.github/workflows/polygonid.yaml
+++ b/.github/workflows/polygonid.yaml
@@ -7,8 +7,8 @@ jobs:
     uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
     with:
       flutter_channel: stable
-      flutter_version: 3.19.6
+      flutter_version: 3.22.1
       min_coverage: 30
       working_directory: packages/polygonid
-      dart_sdk: 3.3.4
+      dart_sdk: 3.4.1
       build_runner: false
diff --git a/.github/workflows/secure_storage.yaml b/.github/workflows/secure_storage.yaml
index 8f292dfb8..40b656652 100644
--- a/.github/workflows/secure_storage.yaml
+++ b/.github/workflows/secure_storage.yaml
@@ -7,8 +7,8 @@ jobs:
     uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
     with:
       flutter_channel: stable
-      flutter_version: 3.19.6
+      flutter_version: 3.22.1
       min_coverage: 30
       working_directory: packages/secure_storage
-      dart_sdk: 3.3.4
+      dart_sdk: 3.4.1
       build_runner: false
diff --git a/packages/key_generator/lib/src/key_generator.dart b/packages/key_generator/lib/src/key_generator.dart
index 46f10a4ec..918c476c3 100644
--- a/packages/key_generator/lib/src/key_generator.dart
+++ b/packages/key_generator/lib/src/key_generator.dart
@@ -1,6 +1,5 @@
 import 'dart:convert';
 import 'dart:typed_data';
-
 import 'package:bip32/bip32.dart' as bip32;
 import 'package:bip39/bip39.dart' as bip393;
 import 'package:dart_bip32_bip44/dart_bip32_bip44.dart';
diff --git a/packages/key_generator/pubspec.yaml b/packages/key_generator/pubspec.yaml
index 91c009179..819da38bd 100644
--- a/packages/key_generator/pubspec.yaml
+++ b/packages/key_generator/pubspec.yaml
@@ -13,15 +13,13 @@ dependencies:
   dart_web3: ^0.0.3
   ed25519_hd_key: ^2.2.0
   hex: ^0.2.0
+  pinenacl: ^0.3.3
   secp256k1: ^0.3.0
   tezart:
     git:
       url: https://github.com/autonomy-system/tezart.git
       ref: e53e4ab9eaabea53cbf70e814efd2245b4659f48
 
-dependency_overrides:
-  pinenacl: ^0.5.1 # tezart from git depends on pinenacl ^0.3.3
-
 dev_dependencies:
   flutter_test:
     sdk: flutter
diff --git a/packages/key_generator/test/src/key_generator_test.dart b/packages/key_generator/test/src/key_generator_test.dart
index aee428e05..81f83783d 100644
--- a/packages/key_generator/test/src/key_generator_test.dart
+++ b/packages/key_generator/test/src/key_generator_test.dart
@@ -138,50 +138,63 @@ void main() {
       });
     });
 
-    group('ethereum', () {
-      const accountType = AccountType.ethereum;
-      test('throw Exception for secretKey from ethereum', () async {
-        final key = await keyGenerator.jwkFromMnemonic(
-          mnemonic: mnemonics,
-          accountType: accountType,
-          derivePathIndex: derivePathIndex,
-        );
-        expect(key, evmJwkKey);
-      });
+    group('EVM', () {
+      const accountTypes = [
+        AccountType.ethereum,
+        AccountType.fantom,
+        AccountType.polygon,
+        AccountType.binance,
+      ];
+
+      for (final accountType in accountTypes) {
+        test('throw Exception for secretKey from ethereum', () async {
+          final key = await keyGenerator.jwkFromMnemonic(
+            mnemonic: mnemonics,
+            accountType: accountType,
+            derivePathIndex: derivePathIndex,
+          );
+          expect(key, evmJwkKey);
+        });
 
-      test('key from secretKey for ethereum', () async {
-        final key = await keyGenerator.jwkFromSecretKey(
-          secretKey: ethereumSecretKey,
-          accountType: accountType,
-        );
-        expect(key, evmJwkKey);
-      });
+        test('key from secretKey for ethereum', () async {
+          final key = await keyGenerator.jwkFromSecretKey(
+            secretKey: ethereumSecretKey,
+            accountType: accountType,
+          );
+          expect(key, evmJwkKey);
+        });
 
-      test('0x wallet address from mnemonics for ethereum', () async {
-        final walletAddress = await keyGenerator.walletAddressFromMnemonic(
-          mnemonic: mnemonics,
-          accountType: accountType,
-          derivePathIndex: derivePathIndex,
-        );
-        expect(walletAddress, ethereumWalletAddress);
-      });
+        test('0x wallet address from mnemonics for ethereum', () async {
+          final walletAddress = await keyGenerator.walletAddressFromMnemonic(
+            mnemonic: mnemonics,
+            accountType: accountType,
+            derivePathIndex: derivePathIndex,
+          );
+          expect(walletAddress, ethereumWalletAddress);
+        });
 
-      test('secretKey from mnemonics for ethereum ', () async {
-        final secretKey = await keyGenerator.secretKeyFromMnemonic(
-          mnemonic: mnemonics,
-          accountType: accountType,
-          derivePathIndex: derivePathIndex,
-        );
-        expect(secretKey, ethereumSecretKey);
-      });
+        test('secretKey from mnemonics for ethereum ', () async {
+          final secretKey = await keyGenerator.secretKeyFromMnemonic(
+            mnemonic: mnemonics,
+            accountType: accountType,
+            derivePathIndex: derivePathIndex,
+          );
+          expect(secretKey, ethereumSecretKey);
+        });
 
-      test('0x wallet address from secret key for ethereum', () async {
-        final walletAddress = await keyGenerator.walletAddressFromSecretKey(
-          secretKey: ethereumSecretKey,
-          accountType: accountType,
-        );
-        expect(walletAddress, ethereumWalletAddress);
-      });
+        test('0x wallet address from secret key for ethereum', () async {
+          final walletAddress = await keyGenerator.walletAddressFromSecretKey(
+            secretKey: ethereumSecretKey,
+            accountType: accountType,
+          );
+          expect(walletAddress, ethereumWalletAddress);
+        });
+      }
+    });
+
+    test('getKeystore returns correct value', () {
+      final data = keyGenerator.getKeystore(secretKey: tezosSecretKey);
+      expect(data.address, tezosWalletAddress);
     });
   });
 }