diff --git a/cli/src/main/java/dev/fitko/fitconnect/cli/CommandExecutor.java b/cli/src/main/java/dev/fitko/fitconnect/cli/CommandExecutor.java
index 8b2a292c1d63015fe10c682ba2a403fa4e282cdf..cd52dad9da02b71b64980ad4808fb99c62d7ed56 100644
--- a/cli/src/main/java/dev/fitko/fitconnect/cli/CommandExecutor.java
+++ b/cli/src/main/java/dev/fitko/fitconnect/cli/CommandExecutor.java
@@ -39,6 +39,8 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static dev.fitko.fitconnect.cli.keygen.JWKGenerator.DEFAULT_KEY_SIZE;
+
 class CommandExecutor {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CommandExecutor.class);
@@ -126,10 +128,8 @@ class CommandExecutor {
 
         LOGGER.info("Generating JWKs ...");
 
-        final int keySize = createTestKeysCommand.keySize == 0 ? 4096 : createTestKeysCommand.keySize;
-
-        final JWKPair encryptionKeyPair = jwkGenerator.generateEncryptionKeyPair(keySize);
-        final JWKPair signatureKeyPair = jwkGenerator.generateSignatureKeyPair(keySize);
+        final JWKPair encryptionKeyPair = jwkGenerator.generateEncryptionKeyPair(DEFAULT_KEY_SIZE);
+        final JWKPair signatureKeyPair = jwkGenerator.generateSignatureKeyPair(DEFAULT_KEY_SIZE);
 
         final KeyWriterSettings keyWriterSettings = KeyWriterSettings.builder()
                 .outputDir(createTestKeysCommand.outputDir)
diff --git a/cli/src/main/java/dev/fitko/fitconnect/cli/commands/CreateTestKeysCommand.java b/cli/src/main/java/dev/fitko/fitconnect/cli/commands/CreateTestKeysCommand.java
index a03f75bbf3d8b58f9a1f3ef1c9f4123bf486faad..4901e7e49d619e475801f389febfc73366710651 100644
--- a/cli/src/main/java/dev/fitko/fitconnect/cli/commands/CreateTestKeysCommand.java
+++ b/cli/src/main/java/dev/fitko/fitconnect/cli/commands/CreateTestKeysCommand.java
@@ -12,9 +12,6 @@ public class CreateTestKeysCommand {
 
     public static final String CREATE_TEST_KEYS_COMMAND_NAME = "keygen";
 
-    @Parameter(names = {"--keySize"}, description = "Unique destination identifier in UUID format", arity = 1)
-    public int keySize = 4096;
-
     @Parameter(names = {"--outDir"}, description = "Output directory folder where the generated test keys are written to", arity = 1)
     public String outputDir;
 
diff --git a/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java b/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java
index 3c9a7ae2b04738622a635b163e86e27768f3e451..705fb8b6eb04da7ee7eccb64a52455c4a560b3e3 100644
--- a/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java
+++ b/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java
@@ -38,6 +38,8 @@ import java.util.UUID;
  */
 public class JWKGenerator {
 
+    public static final int DEFAULT_KEY_SIZE = 4096;
+
     /**
      * Generate a set of public encryption key and private decryption key.
      *