diff --git a/vars/dockerExecute.groovy b/vars/dockerExecute.groovy
index 46b19e0e2..b8dbc14f7 100644
--- a/vars/dockerExecute.groovy
+++ b/vars/dockerExecute.groovy
@@ -12,9 +12,10 @@ import groovy.transform.Field
 @Field def STEP_NAME = getClass().getName()
 @Field def PLUGIN_ID_DOCKER_WORKFLOW = 'docker-workflow'
 
-@Field Set GENERAL_CONFIG_KEYS = ['jenkinsKubernetes']
-
-@Field Set PARAMETER_KEYS = [
+@Field Set GENERAL_CONFIG_KEYS = [
+    'jenkinsKubernetes'
+]
+@Field Set STEP_CONFIG_KEYS = GENERAL_CONFIG_KEYS.plus([
     'containerPortMappings',
     'containerCommand',
     'containerShell',
@@ -31,8 +32,8 @@ import groovy.transform.Field
     'sidecarWorkspace',
     'sidecarVolumeBind',
     'stashContent'
-]
-@Field Set STEP_CONFIG_KEYS = PARAMETER_KEYS
+])
+@Field Set PARAMETER_KEYS = STEP_CONFIG_KEYS
 
 void call(Map parameters = [:], body) {
     handlePipelineStepErrors(stepName: STEP_NAME, stepParameters: parameters) {
diff --git a/vars/dockerExecuteOnKubernetes.groovy b/vars/dockerExecuteOnKubernetes.groovy
index 52d29b78f..8736214e5 100644
--- a/vars/dockerExecuteOnKubernetes.groovy
+++ b/vars/dockerExecuteOnKubernetes.groovy
@@ -9,8 +9,10 @@ import hudson.AbortException
 
 @Field def STEP_NAME = getClass().getName()
 @Field def PLUGIN_ID_KUBERNETES = 'kubernetes'
-@Field Set GENERAL_CONFIG_KEYS = ['jenkinsKubernetes']
-@Field Set PARAMETER_KEYS = [
+@Field Set GENERAL_CONFIG_KEYS = [
+    'jenkinsKubernetes'
+]
+@Field Set STEP_CONFIG_KEYS = GENERAL_CONFIG_KEYS.plus([
     'containerCommand', // specify start command for container created with dockerImage parameter to overwrite Piper default (`/usr/bin/tail -f /dev/null`).
     'containerCommands', //specify start command for containers to overwrite Piper default (`/usr/bin/tail -f /dev/null`). If container's default start command should be used provide empty string like: `['selenium/standalone-chrome': '']`
     'containerEnvVars', //specify environment variables per container. If not provided dockerEnvVars will be used
@@ -22,9 +24,14 @@ import hudson.AbortException
     'dockerImage',
     'dockerWorkspace',
     'dockerEnvVars',
-    'stashContent'
-]
-@Field Set STEP_CONFIG_KEYS = PARAMETER_KEYS.plus(['stashIncludes', 'stashExcludes'])
+    'stashContent',
+    'stashExcludes',
+    'stashIncludes'
+])
+@Field Set PARAMETER_KEYS = STEP_CONFIG_KEYS.minus([
+    'stashIncludes',
+    'stashExcludes'
+])
 
 void call(Map parameters = [:], body) {
     handlePipelineStepErrors(stepName: STEP_NAME, stepParameters: parameters) {