diff --git a/resources/com.sap.piper/pipeline/abapEnvironmentPipelineStageDefaults.yml b/resources/com.sap.piper/pipeline/abapEnvironmentPipelineStageDefaults.yml
new file mode 100644
index 000000000..80f0e88e3
--- /dev/null
+++ b/resources/com.sap.piper/pipeline/abapEnvironmentPipelineStageDefaults.yml
@@ -0,0 +1,46 @@
+stages:
+  Init:
+    ordinal: 1
+
+  'Initial Checks':
+    ordinal: 10
+
+  'Prepare System':
+    ordinal: 20
+    cfService: 'abap'
+    cfServicePlan: 'standard'
+    abapSystemIsDevelopmentAllowed: 'false'
+    abapSystemSizeOfPersistence: 4
+    abapSystemSizeOfRuntime: 1
+
+  'Clone Repositories':
+    ordinal: 30
+
+  ATC:
+    ordinal: 40
+
+  Build:
+    ordinal: 50
+    cfServiceKeyName: 'sap_com_0582'
+    cfServiceKeyConfig: '{"scenario_id":"SAP_COM_0582","type":"basic"}'
+
+  'Integration Tests':
+    ordinal: 60
+    cfService: 'abap'
+    cfServicePlan: 'saas_oem'
+    abapSystemIsDevelopmentAllowed: 'false'
+    abapSystemSizeOfPersistence: 4
+    abapSystemSizeOfRuntime: 1
+    confirmDeletion: 'true'
+    includeAddon: 'true'
+
+  Confirm:
+    ordinal: 70
+
+  Publish:
+    ordinal: 80
+    targetVectorScope: 'P'
+
+  Post:
+    ordinal: 90
+    cfDeleteServiceKeys: true
diff --git a/resources/com.sap.piper/pipeline/abapStageDefaults.yml b/resources/com.sap.piper/pipeline/abapEnvironmentPipelineStages.yml
similarity index 100%
rename from resources/com.sap.piper/pipeline/abapStageDefaults.yml
rename to resources/com.sap.piper/pipeline/abapEnvironmentPipelineStages.yml
diff --git a/resources/com.sap.piper/pipeline/abapStashSettings.yml b/resources/com.sap.piper/pipeline/abapEnvironmentPipelineStashSettings.yml
similarity index 100%
rename from resources/com.sap.piper/pipeline/abapStashSettings.yml
rename to resources/com.sap.piper/pipeline/abapEnvironmentPipelineStashSettings.yml
diff --git a/resources/com.sap.piper/pipeline/abapStageOrdinals.yml b/resources/com.sap.piper/pipeline/abapStageOrdinals.yml
deleted file mode 100644
index 47708a510..000000000
--- a/resources/com.sap.piper/pipeline/abapStageOrdinals.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-stages:
-  Init:
-    ordinal: 1
-
-  'Initial Checks':
-    ordinal: 10
-
-  'Prepare System':
-    ordinal: 20
-
-  'Clone Repositories':
-    ordinal: 30
-
-  ATC:
-    ordinal: 40
-
-  Build:
-    ordinal: 50
-
-  'Integration Tests':
-    ordinal: 60
-
-  Confirm:
-    ordinal: 70
-
-  Publish:
-    ordinal: 80
-
-  Post:
-    ordinal: 90
diff --git a/vars/abapEnvironmentPipeline.groovy b/vars/abapEnvironmentPipeline.groovy
index da52a9c36..d08fc9327 100644
--- a/vars/abapEnvironmentPipeline.groovy
+++ b/vars/abapEnvironmentPipeline.groovy
@@ -8,7 +8,7 @@ void call(parameters) {
 
             stage('Init') {
                 steps {
-                    abapEnvironmentPipelineStageInit script: parameters.script, customDefaults: ['com.sap.piper/pipeline/abapStageOrdinals.yml'].plus(parameters.customDefaults ?: [])
+                    abapEnvironmentPipelineStageInit script: parameters.script, customDefaults: ['com.sap.piper/pipeline/abapEnvironmentPipelineStageDefaults.yml'].plus(parameters.customDefaults ?: [])
                 }
             }
 
diff --git a/vars/abapEnvironmentPipelineStageInit.groovy b/vars/abapEnvironmentPipelineStageInit.groovy
index 2e3f9c54c..aa6fca648 100644
--- a/vars/abapEnvironmentPipelineStageInit.groovy
+++ b/vars/abapEnvironmentPipelineStageInit.groovy
@@ -25,8 +25,8 @@ void call(Map parameters = [:]) {
         // load default & individual configuration
         Map config = ConfigurationHelper.newInstance(this)
             .loadStepDefaults()
-            .addIfEmpty('stageConfigResource', 'com.sap.piper/pipeline/abapStageDefaults.yml')
-            .addIfEmpty('stashSettings', 'com.sap.piper/pipeline/abapStashSettings.yml')
+            .addIfEmpty('stageConfigResource', 'com.sap.piper/pipeline/abapEnvironmentPipelineStages.yml')
+            .addIfEmpty('stashSettings', 'com.sap.piper/pipeline/abapEnvironmentPipelineStashSettings.yml')
             .withMandatoryProperty('stageConfigResource')
             .use()