diff --git a/containers/krknctl-input.json b/containers/krknctl-input.json
index c407dd18..e3d92f96 100644
--- a/containers/krknctl-input.json
+++ b/containers/krknctl-input.json
@@ -29,31 +29,11 @@
     "group": "cerberus"
   },
   {
-    "name": "general",
-    "short_description": "General group",
-    "description": "Group containing general krkn configuration options",
+    "name": "kraken",
+    "short_description": "Kraken group",
+    "description": "Group containing core krkn run configuration options",
     "type": "Group"
   },
-  {
-    "name": "ssh-public-key",
-    "short_description": "Krkn ssh public key path",
-    "description": "Sets the path where krkn will search for ssh public key (in container)",
-    "variable": "KRKN_SSH_PUBLIC",
-    "type": "string",
-    "default": "",
-    "required": "false",
-    "group": "general"
-  },
-  {
-    "name": "ssh-private-key",
-    "short_description": "Krkn ssh private key path",
-    "description": "Sets the path where krkn will search for ssh private key (in container)",
-    "variable": "KRKN_SSH_PRIVATE",
-    "type": "string",
-    "default": "",
-    "required": "false",
-    "group": "general"
-  },
   {
     "name": "krkn-kubeconfig",
     "short_description": "Krkn kubeconfig path",
@@ -62,47 +42,7 @@
     "type": "string",
     "default": "/home/krkn/.kube/config",
     "required": "false",
-    "group": "general"
-  },
-  {
-    "name": "wait-duration",
-    "short_description": "Post chaos wait duration",
-    "description": "waits for a certain amount of time after the scenario",
-    "variable": "WAIT_DURATION",
-    "type": "number",
-    "default": "1",
-    "group": "general"
-  },
-  {
-    "name": "iterations",
-    "short_description": "Chaos scenario iterations",
-    "description": "number of times the same chaos scenario will be executed",
-    "variable": "ITERATIONS",
-    "type": "number",
-    "default": "1",
-    "group": "general"
-  },
-  {
-    "name": "daemon-mode",
-    "short_description": "Sets krkn daemon mode",
-    "description": "if set the scenario will execute forever",
-    "variable": "DAEMON_MODE",
-    "type": "enum",
-    "allowed_values": "True,False",
-    "separator": ",",
-    "default": "False",
-    "required": "false",
-    "group": "general"
-  },
-  {
-    "name": "uuid",
-    "short_description": "Sets krkn run uuid",
-    "description": "sets krkn run uuid instead of generating it",
-    "variable": "UUID",
-    "type": "string",
-    "default": "",
-    "required": "false",
-    "group": "general"
+    "group": "kraken"
   },
   {
     "name": "generate-pdf-report",
@@ -114,7 +54,7 @@
     "separator": ",",
     "default": "True",
     "required": "false",
-    "group": "general"
+    "group": "kraken"
   },
   {
     "name": "krkn-debug",
@@ -126,7 +66,43 @@
     "separator": ",",
     "default": "False",
     "required": "false",
-    "group": "general"
+    "group": "kraken"
+  },
+  {
+    "name": "tunings",
+    "short_description": "Tunings group",
+    "description": "Group containing chaos scenario timing and repetition configuration options",
+    "type": "Group"
+  },
+  {
+    "name": "wait-duration",
+    "short_description": "Post chaos wait duration",
+    "description": "waits for a certain amount of time after the scenario",
+    "variable": "WAIT_DURATION",
+    "type": "number",
+    "default": "1",
+    "group": "tunings"
+  },
+  {
+    "name": "iterations",
+    "short_description": "Chaos scenario iterations",
+    "description": "number of times the same chaos scenario will be executed",
+    "variable": "ITERATIONS",
+    "type": "number",
+    "default": "1",
+    "group": "tunings"
+  },
+  {
+    "name": "daemon-mode",
+    "short_description": "Sets krkn daemon mode",
+    "description": "if set the scenario will execute forever",
+    "variable": "DAEMON_MODE",
+    "type": "enum",
+    "allowed_values": "True,False",
+    "separator": ",",
+    "default": "False",
+    "required": "false",
+    "group": "tunings"
   },
   {
     "name": "prometheus",
@@ -154,6 +130,16 @@
     "required": "false",
     "group": "prometheus"
   },
+  {
+    "name": "uuid",
+    "short_description": "Sets krkn run uuid",
+    "description": "sets krkn run uuid instead of generating it",
+    "variable": "UUID",
+    "type": "string",
+    "default": "",
+    "required": "false",
+    "group": "prometheus"
+  },
   {
     "name": "capture-metrics",
     "short_description": "Enables metrics capture",