diff --git a/vars/abapEnvironmentPipelineStageIntegrationTests.groovy b/vars/abapEnvironmentPipelineStageIntegrationTests.groovy
index 4d88e2c92..bc802a736 100644
--- a/vars/abapEnvironmentPipelineStageIntegrationTests.groovy
+++ b/vars/abapEnvironmentPipelineStageIntegrationTests.groovy
@@ -5,17 +5,16 @@ import com.sap.piper.ConfigurationHelper
 import static com.sap.piper.Prerequisites.checkScript
 
 @Field String STEP_NAME = getClass().getName()
-@Field Set GENERAL_CONFIG_KEYS = [
-    /** If set to true, the system is never deleted */
-    'debug'
-]
+@Field Set GENERAL_CONFIG_KEYS = []
 @Field STAGE_STEP_KEYS = [
     /** Creates a SAP Cloud Platform ABAP Environment system via the cloud foundry command line interface */
     'abapEnvironmentCreateSystem',
     /** Deletes a SAP Cloud Platform ABAP Environment system via the cloud foundry command line interface */
     'cloudFoundryDeleteService',
     /** If set to true, a confirmation is required to delete the system */
-    'confirmDeletion'
+    'confirmDeletion',
+    /** If set to true, the system is never deleted */
+    'debug'
 ]
 @Field Set STEP_CONFIG_KEYS = GENERAL_CONFIG_KEYS.plus(STAGE_STEP_KEYS)
 @Field Set PARAMETER_KEYS = STEP_CONFIG_KEYS
diff --git a/vars/abapEnvironmentPipelineStagePost.groovy b/vars/abapEnvironmentPipelineStagePost.groovy
index 24d89aaf5..8dd5acaf5 100644
--- a/vars/abapEnvironmentPipelineStagePost.groovy
+++ b/vars/abapEnvironmentPipelineStagePost.groovy
@@ -4,15 +4,14 @@ import com.sap.piper.ConfigurationHelper
 import static com.sap.piper.Prerequisites.checkScript
 
 @Field String STEP_NAME = getClass().getName()
-@Field Set GENERAL_CONFIG_KEYS = [
-    /** If set to true, the system is never deleted */
-    'debug'
-]
+@Field Set GENERAL_CONFIG_KEYS = []
 @Field STAGE_STEP_KEYS = [
     /** Deletes a SAP Cloud Platform ABAP Environment instance via the cloud foundry command line interface */
     'cloudFoundryDeleteService',
     /** If set to true, a confirmation is required to delete the system in case the pipeline was not successful */
-    'confirmDeletion'
+    'confirmDeletion',
+    /** If set to true, the system is never deleted */
+    'debug'
 ]
 @Field Set STEP_CONFIG_KEYS = GENERAL_CONFIG_KEYS.plus(STAGE_STEP_KEYS)
 @Field Set PARAMETER_KEYS = STEP_CONFIG_KEYS