diff --git a/vars/checkChangeInDevelopment.groovy b/vars/checkChangeInDevelopment.groovy
index f8e172789..060bdee71 100644
--- a/vars/checkChangeInDevelopment.groovy
+++ b/vars/checkChangeInDevelopment.groovy
@@ -9,8 +9,7 @@ import com.sap.piper.cm.ChangeManagementException
 
 @Field def STEP_NAME = 'checkChangeInDevelopment'
 
-@Field Set parameterKeys = [
-    'changeDocumentId',
+@Field Set stepConfigurationKeys = [
     'cmClientOpts',
     'credentialsId',
     'endpoint',
@@ -21,17 +20,7 @@ import com.sap.piper.cm.ChangeManagementException
     'gitFormat'
   ]
 
-@Field Set stepConfigurationKeys = [
-    'changeDocumentId',
-    'cmClientOpts',
-    'credentialsId',
-    'endpoint',
-    'failIfStatusIsNotInDevelopment',
-    'gitFrom',
-    'gitTo',
-    'gitChangeDocumentLabel',
-    'gitFormat'
-  ]
+@Field Set parameterKeys = stepConfigurationKeys.plus('changeDocumentId')
 
 @Field Set generalConfigurationKeys = stepConfigurationKeys
 
diff --git a/vars/transportRequestCreate.groovy b/vars/transportRequestCreate.groovy
index b5b13a283..1c445b73d 100644
--- a/vars/transportRequestCreate.groovy
+++ b/vars/transportRequestCreate.groovy
@@ -11,18 +11,6 @@ import hudson.AbortException
 
 @Field def STEP_NAME = 'transportRequestCreate'
 
-@Field Set parameterKeys = [
-    'changeDocumentId',
-    'clientOpts',
-    'developmentSystemId',
-    'credentialsId',
-    'endpoint',
-    'gitFrom',
-    'gitTo',
-    'gitChangeDocumentLabel',
-    'gitFormat'
-  ]
-
 @Field Set stepConfigurationKeys = [
     'credentialsId',
     'clientOpts',
@@ -33,6 +21,8 @@ import hudson.AbortException
     'gitFormat'
   ]
 
+@Field Set parameterKeys = stepConfigurationKeys.plus(['changeDocumentId', 'developmentSystemId'])
+
 @Field generalConfigurationKeys = stepConfigurationKeys
 
 def call(parameters = [:]) {
diff --git a/vars/transportRequestRelease.groovy b/vars/transportRequestRelease.groovy
index fa6899b27..0fb114f9b 100644
--- a/vars/transportRequestRelease.groovy
+++ b/vars/transportRequestRelease.groovy
@@ -11,20 +11,17 @@ import hudson.AbortException
 
 @Field def STEP_NAME = 'transportRequestRelease'
 
-@Field Set parameterKeys = [
-    'changeDocumentId',
-    'cmClientOpts',
-    'transportRequestId',
-    'credentialsId',
-    'endpoint'
-  ]
-
 @Field Set stepConfigurationKeys = [
     'credentialsId',
     'cmClientOpts',
     'endpoint'
   ]
 
+@Field Set parameterKeys = stepConfigurationKeys.plus([
+    'changeDocumentId',
+    'transportRequestId',
+  ])
+
 @Field Set generalConfigurationKeys = stepConfigurationKeys
 
 def call(parameters = [:]) {
diff --git a/vars/transportRequestUploadFile.groovy b/vars/transportRequestUploadFile.groovy
index ae4589ddd..2a789dcb7 100644
--- a/vars/transportRequestUploadFile.groovy
+++ b/vars/transportRequestUploadFile.groovy
@@ -11,20 +11,6 @@ import hudson.AbortException
 
 @Field def STEP_NAME = 'transportRequestUploadFile'
 
-@Field Set parameterKeys = [
-    'changeDocumentId',
-    'cmClientOpts',
-    'transportRequestId',
-    'applicationId',
-    'filePath',
-    'credentialsId',
-    'endpoint',
-    'gitFrom',
-    'gitTo',
-    'gitChangeDocumentLabel',
-    'gitFormat'
-  ]
-
 @Field Set generalConfigurationKeys = [
     'credentialsId',
     'cmClientOpts',
@@ -35,6 +21,12 @@ import hudson.AbortException
     'gitFormat'
   ]
 
+@Field Set parameterKeys = generalConfigurationKeys.plus([
+    'applicationId',
+    'changeDocumentId',
+    'filePath',
+    'transportRequestId'])
+
 @Field Set stepConfigurationKeys = generalConfigurationKeys
 
 def call(parameters = [:]) {