diff --git a/multiapps-controller-api/src/main/resources/mtarest.yaml b/multiapps-controller-api/src/main/resources/mtarest.yaml
index 2fa76ac907..bbc4cb40ec 100644
--- a/multiapps-controller-api/src/main/resources/mtarest.yaml
+++ b/multiapps-controller-api/src/main/resources/mtarest.yaml
@@ -37,127 +37,6 @@ paths:
             $ref: "#/definitions/Info"
       security:
       - oauth2: []
-  /api/v1/spaces/{spaceGuid}/files:
-    get:
-      summary: ""
-      description: "Retrieves all Multi-Target Application files "
-      operationId: "getMtaFiles"
-      produces:
-      - "application/json"
-      parameters:
-      - name: "spaceGuid"
-        in: "path"
-        description: "GUID of space with mtas"
-        required: true
-        type: "string"
-      - name: "namespace"
-        in: "query"
-        description: "Filter mtas by namespace"
-        required: false
-        type: "string"
-      responses:
-        200:
-          description: "OK"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/FileMetadata"
-      security:
-      - oauth2: []
-    post:
-      summary: ""
-      description: "Uploads a Multi Target Application archive or an Extension Descriptor "
-      operationId: "uploadMtaFile"
-      consumes:
-      - "multipart/form-data"
-      produces:
-      - "application/json"
-      parameters:
-      - name: "spaceGuid"
-        in: "path"
-        description: "GUID of space you wish to deploy in"
-        required: true
-        type: "string"
-      - name: "namespace"
-        in: "query"
-        description: "file namespace"
-        required: false
-        type: "string"
-      responses:
-        200:
-          description: "successful operation"
-          schema:
-            $ref: "#/definitions/FileMetadata"
-        201:
-          description: "Created"
-          schema:
-            $ref: "#/definitions/FileMetadata"
-      security:
-      - oauth2: []
-  /api/v1/spaces/{spaceGuid}/files/async:
-    post:
-      summary: ""
-      description: "Uploads a Multi Target Application archive or an Extension Descriptor\
-        \ from a remote endpoint"
-      operationId: "startUploadFromUrl"
-      consumes:
-      - "application/json"
-      parameters:
-      - name: "spaceGuid"
-        in: "path"
-        description: "GUID of space you wish to deploy in"
-        required: true
-        type: "string"
-      - name: "namespace"
-        in: "query"
-        description: "file namespace"
-        required: false
-        type: "string"
-      - in: "body"
-        name: "body"
-        description: "URL reference to a remote file"
-        required: false
-        schema:
-          $ref: "#/definitions/FileUrl"
-      responses:
-        202:
-          description: "Accepted"
-      security:
-      - oauth2: []
-  /api/v1/spaces/{spaceGuid}/files/jobs/{jobId}:
-    get:
-      summary: ""
-      description: "Gets the status of an async upload job"
-      operationId: "getAsyncUploadJob"
-      produces:
-      - "application/json"
-      parameters:
-      - name: "spaceGuid"
-        in: "path"
-        description: "GUID of space you wish to deploy in"
-        required: true
-        type: "string"
-      - name: "namespace"
-        in: "query"
-        description: "file namespace"
-        required: false
-        type: "string"
-      - name: "jobId"
-        in: "path"
-        description: "ID of the upload job"
-        required: true
-        type: "string"
-      responses:
-        200:
-          description: "OK"
-          schema:
-            $ref: "#/definitions/AsyncUploadResult"
-        201:
-          description: "Created"
-          schema:
-            $ref: "#/definitions/AsyncUploadResult"
-      security:
-      - oauth2: []
   /api/v1/spaces/{spaceGuid}/mtas:
     get:
       summary: ""
@@ -403,66 +282,6 @@ securityDefinitions:
     flow: "password"
     scopes: {}
 definitions:
-  AsyncUploadResult:
-    type: "object"
-    properties:
-      status:
-        type: "string"
-        readOnly: true
-        enum:
-        - "RUNNING"
-        - "FINISHED"
-        - "ERROR"
-      bytes_processed:
-        type: "integer"
-        format: "int64"
-        readOnly: true
-      error:
-        type: "string"
-        readOnly: true
-      file:
-        readOnly: true
-        $ref: "#/definitions/FileMetadata"
-      mta_id:
-        type: "string"
-        readOnly: true
-      client_actions:
-        type: "array"
-        readOnly: true
-        items:
-          type: "string"
-          enum:
-          - "RETRY_UPLOAD"
-  FileMetadata:
-    type: "object"
-    properties:
-      id:
-        type: "string"
-        readOnly: true
-      name:
-        type: "string"
-        readOnly: true
-      size:
-        type: "integer"
-        readOnly: true
-      digest:
-        type: "string"
-        readOnly: true
-      digestAlgorithm:
-        type: "string"
-        readOnly: true
-      space:
-        type: "string"
-        readOnly: true
-      namespace:
-        type: "string"
-        readOnly: true
-  FileUrl:
-    type: "object"
-    properties:
-      file_url:
-        type: "string"
-        readOnly: true
   Info:
     type: "object"
     properties:
diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/Messages.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/Messages.java
index 5d99deb953..8cbf45decb 100644
--- a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/Messages.java
+++ b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/Messages.java
@@ -179,7 +179,7 @@ public final class Messages {
     public static final String THREAD_MONITOR_CACHE_TIMEOUT = "Flowable thread monitor cache timeout: {0} seconds";
     public static final String SPACE_DEVELOPERS_CACHE_TIME_IN_SECONDS = "Cache for list of space developers per SpaceGUID: {0} seconds";
     public static final String APP_SHUTDOWN_REQUEST = "Application with id:\"{0}\", instance id:\"{1}\", instance index:\"{2}\", is requested to shutdown. Timeout to wait before shutdown of Flowable job executor:\"{3}\" seconds.";
-    public static final String APP_SHUTDOWNED = "Application with id:\"{0}\", instance id:\"{1}\", instance index:\"{2}\", is shutdowned. Timeout to wait before shutdown of Flowable job executor:\"{3}\" seconds.";
+    public static final String APP_SUCCESSFULLY_SHUTDOWN = "Application with id:\"{0}\", instance id:\"{1}\", instance index:\"{2}\", is shutdown. Timeout to wait before shutdown of Flowable job executor:\"{3}\" seconds.";
     public static final String APP_SHUTDOWN_STATUS_MONITOR = "Monitor shutdown status of application with id:\"{0}\", instance id:\"{1}\", instance index:\"{2}\". Status:\"{3}\".";
     public static final String CONTROLLER_CLIENT_SSL_HANDSHAKE_TIMEOUT_IN_SECONDS = "Controller client SSL handshake timeout in seconds: {0}";
     public static final String CONTROLLER_CLIENT_CONNECT_TIMEOUT_IN_SECONDS = "Controller client connect timeout in seconds: {0}";
diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminer.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminer.java
index 7e0b54d0e5..d191580212 100644
--- a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminer.java
+++ b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminer.java
@@ -10,7 +10,7 @@ public AppSuffixDeterminer(boolean keepOriginalNamesAfterDeploy, boolean isAfter
         this.isAfterResumePhase = isAfterResumePhase;
     }
 
-    public boolean shouldAppendApplicationSuffix() {
+    public boolean shouldAppendIdleSuffix() {
         return keepOriginalNamesAfterDeploy && isAfterResumePhase;
     }
 }
diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/v2/ApplicationCloudModelBuilder.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/v2/ApplicationCloudModelBuilder.java
index 2910e5e4e7..0abebaf7c6 100644
--- a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/v2/ApplicationCloudModelBuilder.java
+++ b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/v2/ApplicationCloudModelBuilder.java
@@ -152,7 +152,7 @@ private DeployedMtaApplication findDeployedApplication(String moduleName, Deploy
 
     private String getApplicationName(Module module) {
         String applicationName = NameUtil.getApplicationName(module);
-        if (appSuffixDeterminer.shouldAppendApplicationSuffix()) {
+        if (appSuffixDeterminer.shouldAppendIdleSuffix()) {
             applicationName += BlueGreenApplicationNameSuffix.IDLE.asSuffix();
         }
         return applicationName;
diff --git a/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminerTest.java b/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminerTest.java
index bce9c48cb8..ea99048ff4 100644
--- a/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminerTest.java
+++ b/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/cf/detect/AppSuffixDeterminerTest.java
@@ -1,18 +1,18 @@
 package org.cloudfoundry.multiapps.controller.core.cf.detect;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.util.stream.Stream;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 class AppSuffixDeterminerTest {
 
     static Stream<Arguments> testAppSuffixDeterminer() {
         return Stream.of(
-        //@formatter:off
+            //@formatter:off
             // (1) Keep original app names is not set and the process is not after resume phase
             Arguments.of(false, false, false),
             // (2) Keep original app names is set but the process is not after resume phase
@@ -29,6 +29,6 @@ static Stream<Arguments> testAppSuffixDeterminer() {
     @MethodSource
     void testAppSuffixDeterminer(boolean keepOriginalNamesAfterDeploy, boolean isAfterResumePhase, boolean shouldAppendApplicationSuffix) {
         AppSuffixDeterminer appSuffixDeterminer = new AppSuffixDeterminer(keepOriginalNamesAfterDeploy, isAfterResumePhase);
-        assertEquals(shouldAppendApplicationSuffix, appSuffixDeterminer.shouldAppendApplicationSuffix());
+        assertEquals(shouldAppendApplicationSuffix, appSuffixDeterminer.shouldAppendIdleSuffix());
     }
 }
diff --git a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java
index a2f1261b98..0fd9fdc598 100644
--- a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java
+++ b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java
@@ -161,7 +161,6 @@ public class Messages {
     public static final String ERROR_MONITORING_OPERATIONS_OVER_SERVICES = "Error monitoring operations over services";
     public static final String ERROR_DELETING_REMAINING_FILE_PARTS = "Error deleting remaining file parts";
     public static final String ERROR_DETECTING_APPLICATIONS_TO_RENAME = "Error detecting applications to rename";
-    public static final String ERROR_RENAMING_NEW_APPLICATIONS = "Error renaming new applications";
     public static final String ERROR_MONITORING_CREATION_OR_UPDATE_OF_SERVICES = "Error monitoring creation or update of services";
     public static final String ERROR_MONITORING_DELETION_OF_SERVICES = "Error monitoring deletion of services";
     public static final String SERVICE_IS_ALREADY_DELETED = "Service \"{0}\" is already deleted";
diff --git a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateAppStep.java b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateAppStep.java
index cb190b0b61..59d79bc17b 100644
--- a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateAppStep.java
+++ b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateAppStep.java
@@ -18,6 +18,7 @@
 import org.cloudfoundry.multiapps.controller.client.facade.CloudControllerClient;
 import org.cloudfoundry.multiapps.controller.client.facade.CloudCredentials;
 import org.cloudfoundry.multiapps.controller.client.facade.domain.CloudApplication;
+import org.cloudfoundry.multiapps.controller.client.facade.domain.ImmutableCloudApplication;
 import org.cloudfoundry.multiapps.controller.client.facade.domain.ImmutableStaging;
 import org.cloudfoundry.multiapps.controller.client.facade.domain.Staging;
 import org.cloudfoundry.multiapps.controller.client.facade.dto.ApplicationToCreateDto;
@@ -28,8 +29,11 @@
 import org.cloudfoundry.multiapps.controller.core.cf.clients.AppBoundServiceInstanceNamesGetter;
 import org.cloudfoundry.multiapps.controller.core.cf.clients.WebClientFactory;
 import org.cloudfoundry.multiapps.controller.core.helpers.ApplicationFileDigestDetector;
+import org.cloudfoundry.multiapps.controller.core.model.BlueGreenApplicationNameSuffix;
 import org.cloudfoundry.multiapps.controller.core.security.token.TokenService;
 import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
+import org.cloudfoundry.multiapps.controller.persistence.model.ConfigurationSubscription;
+import org.cloudfoundry.multiapps.controller.persistence.services.ConfigurationSubscriptionService;
 import org.cloudfoundry.multiapps.controller.persistence.services.FileStorageException;
 import org.cloudfoundry.multiapps.controller.process.Messages;
 import org.cloudfoundry.multiapps.controller.process.util.ApplicationAttributeUpdater;
@@ -59,6 +63,8 @@ public class CreateOrUpdateAppStep extends SyncFlowableStep {
     private WebClientFactory webClientFactory;
     @Inject
     private ApplicationConfiguration configuration;
+    @Inject
+    private ConfigurationSubscriptionService subscriptionService;
 
     @Override
     protected StepPhase executeStep(ProcessContext context) throws FileStorageException {
@@ -95,7 +101,9 @@ protected AppBoundServiceInstanceNamesGetter getAppBoundServiceInstanceNamesGett
         return new AppBoundServiceInstanceNamesGetter(configuration, webClientFactory, credentials, correlationId);
     }
 
-    private StepFlowHandler createStepFlowHandler(ProcessContext context, CloudControllerClient client, CloudApplicationExtended app,
+    private StepFlowHandler createStepFlowHandler(ProcessContext context,
+                                                  CloudControllerClient client,
+                                                  CloudApplicationExtended app,
                                                   CloudApplication existingApp) {
         if (existingApp == null) {
             return new CreateAppFlowHandler(context, client, app);
@@ -213,7 +221,9 @@ private class UpdateAppFlowHandler extends StepFlowHandler {
 
         final CloudApplication existingApp;
 
-        public UpdateAppFlowHandler(ProcessContext context, CloudControllerClient client, CloudApplicationExtended app,
+        public UpdateAppFlowHandler(ProcessContext context,
+                                    CloudControllerClient client,
+                                    CloudApplicationExtended app,
                                     CloudApplication existingApp) {
             super(context, client, app);
             this.existingApp = existingApp;
@@ -231,7 +241,9 @@ public void handleApplicationAttributes() {
 
             reportApplicationUpdateStatus(app, arePropertiesChanged);
             context.setVariable(Variables.VCAP_APP_PROPERTIES_CHANGED, arePropertiesChanged);
+
             updateApplicationEnvironment();
+            updateApplicationName();
         }
 
         private void updateApplicationEnvironment() {
@@ -279,6 +291,31 @@ private UpdateStrategy getEnvUpdateStrategy() {
                       .shouldKeepExistingEnv() ? UpdateStrategy.MERGE : UpdateStrategy.REPLACE;
         }
 
+        public void updateApplicationName() {
+            boolean processIsBlueGreenWithIdleSuffix = StepsUtil.getAppSuffixDeterminer(context)
+                                                                .shouldAppendIdleSuffix();
+            if (!processIsBlueGreenWithIdleSuffix) {
+                return;
+            }
+
+            String oldName = existingApp.getName();
+            String newName = BlueGreenApplicationNameSuffix.removeSuffix(oldName);
+            if (oldName.equals(newName)) {
+                getStepLogger().info(Messages.THE_DETECTED_APPLICATION_HAS_THE_SAME_NAME_AS_THE_NEW_ONE);
+                return;
+            }
+
+            getStepLogger().info(Messages.RENAMING_APPLICATION_0_TO_1, oldName, newName);
+            client.rename(oldName, newName);
+
+            context.setVariable(Variables.EXISTING_APP, ImmutableCloudApplication.copyOf(existingApp)
+                                                                                 .withName(newName));
+            context.setVariable(Variables.APP_TO_PROCESS, ImmutableCloudApplicationExtended.copyOf(app)
+                                                                                           .withName(newName));
+
+            updateConfigurationSubscribers(oldName, newName);
+        }
+
         @Override
         public void handleApplicationServices() {
             if (context.getVariable(Variables.SHOULD_SKIP_SERVICE_REBINDING)) {
@@ -298,6 +335,40 @@ public void printStepEndMessage() {
             getStepLogger().debug(Messages.APP_UPDATED, app.getName());
         }
 
+        private void updateConfigurationSubscribers(String oldAppName, String newAppName) {
+            String mtaId = context.getVariable(Variables.MTA_ID);
+            String spaceGuid = context.getVariable(Variables.SPACE_GUID);
+
+            List<ConfigurationSubscription> subscriptions = subscriptionService.createQuery()
+                                                                               .mtaId(mtaId)
+                                                                               .spaceId(spaceGuid)
+                                                                               .list();
+            for (ConfigurationSubscription subscription : subscriptions) {
+                if (oldAppName.equals(subscription.getAppName())) {
+                    getStepLogger().debug(Messages.UPDATING_CONFIGURATION_SUBSCRIPTION_0_WITH_NAME_1, subscription.getAppName(),
+                                          newAppName);
+                    updateConfigurationSubscription(subscription, newAppName);
+                }
+            }
+        }
+
+        private void updateConfigurationSubscription(ConfigurationSubscription subscription, String newAppName) {
+            ConfigurationSubscription newSubscription = createNewSubscription(subscription, newAppName);
+            subscriptionService.update(subscription, newSubscription);
+        }
+
+        private ConfigurationSubscription createNewSubscription(ConfigurationSubscription subscription, String newAppName) {
+            return new ConfigurationSubscription(subscription.getId(),
+                                                 subscription.getMtaId(),
+                                                 subscription.getSpaceId(),
+                                                 newAppName,
+                                                 subscription.getFilter(),
+                                                 subscription.getModuleDto(),
+                                                 subscription.getResourceDto(),
+                                                 subscription.getModuleId(),
+                                                 subscription.getResourceId());
+        }
+
         private List<String> getMtaAndExistingServices() {
             var serviceNamesGetter = getAppBoundServiceInstanceNamesGetter(context);
             return Stream.of(app.getServices(), serviceNamesGetter.getServiceInstanceNamesBoundToApp(existingApp.getGuid()))
diff --git a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/RemoveNewApplicationsSuffixStep.java b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/RemoveNewApplicationsSuffixStep.java
deleted file mode 100644
index aee843d5d3..0000000000
--- a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/RemoveNewApplicationsSuffixStep.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.cloudfoundry.multiapps.controller.process.steps;
-
-import java.util.List;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import org.cloudfoundry.multiapps.controller.client.facade.CloudControllerClient;
-import org.cloudfoundry.multiapps.controller.core.model.BlueGreenApplicationNameSuffix;
-import org.cloudfoundry.multiapps.controller.persistence.model.ConfigurationSubscription;
-import org.cloudfoundry.multiapps.controller.persistence.services.ConfigurationSubscriptionService;
-import org.cloudfoundry.multiapps.controller.process.Messages;
-import org.cloudfoundry.multiapps.controller.process.variables.Variables;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.Scope;
-
-@Named("removeNewApplicationsSuffixStep")
-@Scope(BeanDefinition.SCOPE_PROTOTYPE)
-public class RemoveNewApplicationsSuffixStep extends SyncFlowableStep {
-
-    @Inject
-    private ConfigurationSubscriptionService subscriptionService;
-
-    @Override
-    protected StepPhase executeStep(ProcessContext context) {
-        if (!context.getVariable(Variables.KEEP_ORIGINAL_APP_NAMES_AFTER_DEPLOY)) {
-            return StepPhase.DONE;
-        }
-
-        List<String> appsToProcess = context.getVariable(Variables.APPS_TO_DEPLOY);
-        CloudControllerClient client = context.getControllerClient();
-
-        for (String appName : appsToProcess) {
-            String newName = BlueGreenApplicationNameSuffix.removeSuffix(appName);
-            getStepLogger().info(Messages.RENAMING_APPLICATION_0_TO_1, appName, newName);
-            client.rename(appName, newName);
-        }
-
-        String mtaId = context.getVariable(Variables.MTA_ID);
-        String spaceId = context.getVariable(Variables.SPACE_GUID);
-        updateConfigurationSubscribers(appsToProcess, mtaId, spaceId);
-
-        return StepPhase.DONE;
-    }
-
-    private void updateConfigurationSubscribers(List<String> appsToProcess, String mtaId, String spaceId) {
-        List<ConfigurationSubscription> subscriptions = subscriptionService.createQuery()
-                                                                           .mtaId(mtaId)
-                                                                           .spaceId(spaceId)
-                                                                           .list();
-        for (ConfigurationSubscription subscription : subscriptions) {
-            if (appsToProcess.contains(subscription.getAppName())) {
-                String newAppName = BlueGreenApplicationNameSuffix.removeSuffix(subscription.getAppName());
-                getStepLogger().debug(Messages.UPDATING_CONFIGURATION_SUBSCRIPTION_0_WITH_NAME_1, subscription.getAppName(), newAppName);
-                updateConfigurationSubscription(subscription, newAppName);
-            }
-        }
-    }
-
-    private void updateConfigurationSubscription(ConfigurationSubscription subscription, String newAppName) {
-        ConfigurationSubscription newSubscription = createNewSubscription(subscription, newAppName);
-        subscriptionService.update(subscription, newSubscription);
-    }
-
-    private ConfigurationSubscription createNewSubscription(ConfigurationSubscription subscription, String newAppName) {
-        return new ConfigurationSubscription(subscription.getId(), subscription.getMtaId(), subscription.getSpaceId(), newAppName,
-                                             subscription.getFilter(), subscription.getModuleDto(), subscription.getResourceDto(),
-                                             subscription.getModuleId(), subscription.getResourceId());
-    }
-
-    @Override
-    protected String getStepErrorMessage(ProcessContext context) {
-        return Messages.ERROR_RENAMING_NEW_APPLICATIONS;
-    }
-
-}
diff --git a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/StepsUtil.java b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/StepsUtil.java
index 7228b15780..3dba3e9306 100644
--- a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/StepsUtil.java
+++ b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/StepsUtil.java
@@ -216,7 +216,7 @@ static ApplicationCloudModelBuilder getApplicationCloudModelBuilder(ProcessConte
                                                               shouldApplyIncrementalInstancesUpdate(context));
     }
 
-    static AppSuffixDeterminer getAppSuffixDeterminer(ProcessContext context) {
+    public static AppSuffixDeterminer getAppSuffixDeterminer(ProcessContext context) {
         boolean keepOriginalNamesAfterDeploy = context.getVariable(Variables.KEEP_ORIGINAL_APP_NAMES_AFTER_DEPLOY);
         boolean isAfterResumePhase = context.getVariable(Variables.PHASE) == Phase.AFTER_RESUME;
         return new AppSuffixDeterminer(keepOriginalNamesAfterDeploy, isAfterResumePhase);
diff --git a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-bg-deploy.bpmn b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-bg-deploy.bpmn
index 0764bbbfa7..b50086161f 100644
--- a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-bg-deploy.bpmn
+++ b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-bg-deploy.bpmn
@@ -133,7 +133,6 @@
     <sequenceFlow id="flow49" sourceRef="buildUndeployModelTask" targetRef="addDomainsTask"></sequenceFlow>
     <sequenceFlow id="flow151" sourceRef="computeNextModulesToDeployInParallel" targetRef="deployModulesParallel"></sequenceFlow>
     <inclusiveGateway id="setValidationPhaseStartedInclusiveGateway"></inclusiveGateway>
-    <serviceTask id="sid-19B8BC9E-6AEC-4F83-9AC6-C53216797F33" name="Remove New Apps suffix" flowable:async="true" flowable:delegateExpression="${removeNewApplicationsSuffixStep}"></serviceTask>
     <exclusiveGateway id="sid-5B2AE114-1CBF-47C2-82D5-4CB9379C6136" name="Restart Apps Mode Gateway" default="sid-065FFC8D-12B3-4D53-B7F6-A0D2B3EA9420"></exclusiveGateway>
     <sequenceFlow id="sid-91F14D78-6B14-407B-8D03-DE7B6EC32F34" sourceRef="prepareAppsRestartTask" targetRef="sid-5B2AE114-1CBF-47C2-82D5-4CB9379C6136"></sequenceFlow>
     <inclusiveGateway id="restartAppsModeGateway" name="restartAppsModeGateway" default="shouldRestartAppsSequentialFlow"></inclusiveGateway>
@@ -219,19 +218,14 @@
     <sequenceFlow id="sid-FC7F56D7-4472-416D-B028-1ED6095D12A2" sourceRef="deleteServicesCallActivity" targetRef="updateSubscribersTask"></sequenceFlow>
     <sequenceFlow id="sid-49A212DC-E070-4ECD-8C04-FD205869CF1B" sourceRef="detachServicesFromMtaTask" targetRef="updateSubscribersTask"></sequenceFlow>
     <sequenceFlow id="sid-28CE5BFA-32C6-42FB-8296-2015C369E8DD" sourceRef="deleteDiscontinuedConfigurationEntriesTask" targetRef="shouldDeleteDiscontinuedServiceBrokersGateway"></sequenceFlow>
-    <sequenceFlow id="sid-82DC4073-CDBC-47E5-AFC3-B5FFD7AB1499" name="Don't delete service brokers" sourceRef="shouldDeleteDiscontinuedServiceBrokersGateway" targetRef="sid-19B8BC9E-6AEC-4F83-9AC6-C53216797F33"></sequenceFlow>
     <sequenceFlow id="flowHasGitGateway" sourceRef="startEvent" targetRef="validateParametersTask"></sequenceFlow>
     <callActivity id="sid-2827E336-1827-4AC2-BCE2-AD2A8B3DE595" name="Backup Existing App Call Activity" flowable:async="true" calledElement="backupExistingAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
       <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToBackup" flowable:elementVariable="appToProcess"></multiInstanceLoopCharacteristics>
     </callActivity>
-    <sequenceFlow id="sid-80047DB4-2E71-43B5-A93B-687A54A02448" sourceRef="sid-F9BE9E7F-9BF9-428B-96E7-D395381BF7AD" targetRef="sid-19B8BC9E-6AEC-4F83-9AC6-C53216797F33">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${(StepExecution == "DONE")}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="shouldDeployModulesSequentialFlow" sourceRef="deploymentModeGateway" targetRef="deployModulesSequential"></sequenceFlow>
     <sequenceFlow id="shouldDeployModulesParallelFlow" sourceRef="deploymentModeGateway" targetRef="computeNextModulesToDeployInParallel">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${(deploymentMode == "PARALLEL")}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-8FC695CB-74D1-43B1-BDF1-C472450BEC19" sourceRef="sid-19B8BC9E-6AEC-4F83-9AC6-C53216797F33" targetRef="undeployAppCallActivity"></sequenceFlow>
     <sequenceFlow id="sid-5F48B17E-DD8B-4609-86D4-61D2E10DFCC2" sourceRef="sid-2827E336-1827-4AC2-BCE2-AD2A8B3DE595" targetRef="shouldDeleteDiscontinuedServicesGateway"></sequenceFlow>
     <sequenceFlow id="sid-9C29A3A5-DDC1-4A6D-B7DA-04C3367DC343" sourceRef="setUndeployPhaseInclusiveGateway" targetRef="deleteSubscriptionsTask">
       <extensionElements>
@@ -240,6 +234,10 @@
     </sequenceFlow>
     <sequenceFlow id="sid-63741827-A046-4960-A5C2-DE8333C06752" sourceRef="undeployAppCallActivity" targetRef="deleteServiceKeysSubProcess"></sequenceFlow>
     <sequenceFlow id="sid-7569B7CF-BAD8-4F86-9879-88E283BD0E7B" sourceRef="deleteServiceKeysSubProcess" targetRef="sid-2827E336-1827-4AC2-BCE2-AD2A8B3DE595"></sequenceFlow>
+    <sequenceFlow id="sid-82DC4073-CDBC-47E5-AFC3-B5FFD7AB1499" name="Don't delete service brokers" sourceRef="shouldDeleteDiscontinuedServiceBrokersGateway" targetRef="undeployAppCallActivity"></sequenceFlow>
+    <sequenceFlow id="sid-80047DB4-2E71-43B5-A93B-687A54A02448" sourceRef="sid-F9BE9E7F-9BF9-428B-96E7-D395381BF7AD" targetRef="undeployAppCallActivity">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${(StepExecution == "DONE")}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_xs2-bg-deploy">
     <bpmndi:BPMNPlane bpmnElement="xs2-bg-deploy" id="BPMNPlane_xs2-bg-deploy">
@@ -385,7 +383,7 @@
         <omgdc:Bounds height="40.0" width="40.0" x="2055.0" y="510.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="undeployAppCallActivity" id="BPMNShape_undeployAppCallActivity">
-        <omgdc:Bounds height="80.0" width="100.0" x="1050.5" y="551.5"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="1129.947575573287" y="551.4999917820097"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="deleteRemainingFileParts" id="BPMNShape_deleteRemainingFileParts">
         <omgdc:Bounds height="65.0" width="105.0" x="880.5" y="27.0"></omgdc:Bounds>
@@ -405,9 +403,6 @@
       <bpmndi:BPMNShape bpmnElement="setValidationPhaseStartedInclusiveGateway" id="BPMNShape_setValidationPhaseStartedInclusiveGateway">
         <omgdc:Bounds height="40.0" width="40.0" x="1110.0" y="382.2500000000002"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-19B8BC9E-6AEC-4F83-9AC6-C53216797F33" id="BPMNShape_sid-19B8BC9E-6AEC-4F83-9AC6-C53216797F33">
-        <omgdc:Bounds height="70.0" width="106.0" x="1175.5" y="560.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-5B2AE114-1CBF-47C2-82D5-4CB9379C6136" id="BPMNShape_sid-5B2AE114-1CBF-47C2-82D5-4CB9379C6136">
         <omgdc:Bounds height="40.0" width="40.0" x="1473.0" y="382.2500000000002"></omgdc:Bounds>
       </bpmndi:BPMNShape>
@@ -427,10 +422,10 @@
         <omgdc:Bounds height="31.0" width="31.0" x="1472.0" y="683.5"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="deleteServiceKeysSubProcess" id="BPMNShape_deleteServiceKeysSubProcess">
-        <omgdc:Bounds height="62.0" width="105.0" x="882.5" y="560.5"></omgdc:Bounds>
+        <omgdc:Bounds height="62.0" width="105.0" x="961.9475755732869" y="560.4999917820097"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-2827E336-1827-4AC2-BCE2-AD2A8B3DE595" id="BPMNShape_sid-2827E336-1827-4AC2-BCE2-AD2A8B3DE595">
-        <omgdc:Bounds height="80.0" width="100.0" x="717.604825099414" y="551.5"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.0" x="797.052400672701" y="551.4999917820097"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="continueDeployProcessFlow" id="BPMNEdge_continueDeployProcessFlow">
         <omgdi:waypoint x="582.9499999999725" y="459.18518518518533"></omgdi:waypoint>
@@ -439,10 +434,9 @@
         <omgdi:waypoint x="770.4999999999932" y="402.10416666666674"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-80047DB4-2E71-43B5-A93B-687A54A02448" id="BPMNEdge_sid-80047DB4-2E71-43B5-A93B-687A54A02448">
-        <omgdi:waypoint x="1367.0" y="699.0"></omgdi:waypoint>
-        <omgdi:waypoint x="1337.0" y="699.0"></omgdi:waypoint>
-        <omgdi:waypoint x="1337.0" y="595.0"></omgdi:waypoint>
-        <omgdi:waypoint x="1281.45" y="595.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1387.0" y="679.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1387.0" y="591.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1229.8975755732627" y="591.3792513986517"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-91F14D78-6B14-407B-8D03-DE7B6EC32F34" id="BPMNEdge_sid-91F14D78-6B14-407B-8D03-DE7B6EC32F34">
         <omgdi:waypoint x="1441.4499999999616" y="402.2500000000002"></omgdi:waypoint>
@@ -476,9 +470,9 @@
         <omgdi:waypoint x="587.5384698530146" y="802.4253731343283"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow127" id="BPMNEdge_flow127">
-        <omgdi:waypoint x="784.5060313742674" y="916.820819112628"></omgdi:waypoint>
-        <omgdi:waypoint x="690.5060313742674" y="916.5"></omgdi:waypoint>
-        <omgdi:waypoint x="615.911361323506" y="814.0375952260031"></omgdi:waypoint>
+        <omgdi:waypoint x="784.506031374251" y="916.6428717957407"></omgdi:waypoint>
+        <omgdi:waypoint x="690.0" y="916.0"></omgdi:waypoint>
+        <omgdi:waypoint x="615.9029972892037" y="814.0459256571219"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
         <omgdi:waypoint x="832.9499999999999" y="59.5"></omgdi:waypoint>
@@ -497,8 +491,8 @@
         <omgdi:waypoint x="846.3708921747466" y="849.5042397921873"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-63741827-A046-4960-A5C2-DE8333C06752" id="BPMNEdge_sid-63741827-A046-4960-A5C2-DE8333C06752">
-        <omgdi:waypoint x="1050.499999999829" y="591.5"></omgdi:waypoint>
-        <omgdi:waypoint x="987.4499999999999" y="591.5"></omgdi:waypoint>
+        <omgdi:waypoint x="1129.947575573204" y="591.4999917820097"></omgdi:waypoint>
+        <omgdi:waypoint x="1066.8975755732654" y="591.4999917820097"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4">
         <omgdi:waypoint x="1286.9499999999946" y="59.32272727272727"></omgdi:waypoint>
@@ -547,29 +541,25 @@
         <omgdi:waypoint x="961.0060313742674" y="897.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-49A212DC-E070-4ECD-8C04-FD205869CF1B" id="BPMNEdge_sid-49A212DC-E070-4ECD-8C04-FD205869CF1B">
-        <omgdi:waypoint x="454.854825099414" y="654.7775377969763"></omgdi:waypoint>
-        <omgdi:waypoint x="390.604825099414" y="654.5"></omgdi:waypoint>
-        <omgdi:waypoint x="390.604825099414" y="610.0"></omgdi:waypoint>
+        <omgdi:waypoint x="454.85482509940164" y="654.5573883596489"></omgdi:waypoint>
+        <omgdi:waypoint x="390.0" y="654.0"></omgdi:waypoint>
+        <omgdi:waypoint x="390.0" y="610.0"></omgdi:waypoint>
         <omgdi:waypoint x="222.9560313742674" y="610.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow124" id="BPMNEdge_flow124">
-        <omgdi:waypoint x="830.5073081623957" y="865.2006332531995"></omgdi:waypoint>
-        <omgdi:waypoint x="730.5060313742674" y="866.5"></omgdi:waypoint>
-        <omgdi:waypoint x="730.7153336998488" y="839.4499999999999"></omgdi:waypoint>
+        <omgdi:waypoint x="830.5065929358674" y="865.1331781006828"></omgdi:waypoint>
+        <omgdi:waypoint x="730.0" y="866.0"></omgdi:waypoint>
+        <omgdi:waypoint x="730.4165598659076" y="839.4499999999999"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="doNotRestartSubscribersFlow" id="BPMNEdge_doNotRestartSubscribersFlow">
-        <omgdi:waypoint x="169.50603137426742" y="822.4419621273166"></omgdi:waypoint>
-        <omgdi:waypoint x="169.50603137426742" y="926.5"></omgdi:waypoint>
-        <omgdi:waypoint x="365.5074264988075" y="923.6992659231826"></omgdi:waypoint>
+        <omgdi:waypoint x="169.42441738038997" y="822.3685900411073"></omgdi:waypoint>
+        <omgdi:waypoint x="169.0" y="926.0"></omgdi:waypoint>
+        <omgdi:waypoint x="365.50699482192675" y="923.6656608918397"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow39" id="BPMNEdge_flow39">
         <omgdi:waypoint x="1788.0729559271679" y="613.8250850738707"></omgdi:waypoint>
         <omgdi:waypoint x="1745.9499999999687" y="613.6847434791212"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-8FC695CB-74D1-43B1-BDF1-C472450BEC19" id="BPMNEdge_sid-8FC695CB-74D1-43B1-BDF1-C472450BEC19">
-        <omgdi:waypoint x="1175.5" y="593.55078125"></omgdi:waypoint>
-        <omgdi:waypoint x="1150.4499999999982" y="592.8658203125001"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow36" id="BPMNEdge_flow36">
         <omgdi:waypoint x="1066.95" y="335.0"></omgdi:waypoint>
         <omgdi:waypoint x="1087.0" y="335.0"></omgdi:waypoint>
@@ -577,9 +567,9 @@
         <omgdi:waypoint x="1110.0891003460208" y="402.1343930635839"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-9C29A3A5-DDC1-4A6D-B7DA-04C3367DC343" id="BPMNEdge_sid-9C29A3A5-DDC1-4A6D-B7DA-04C3367DC343">
-        <omgdi:waypoint x="2075.0" y="549.9380681818183"></omgdi:waypoint>
-        <omgdi:waypoint x="2075.0" y="613.5"></omgdi:waypoint>
-        <omgdi:waypoint x="1893.0229559271893" y="613.9972666698765"></omgdi:waypoint>
+        <omgdi:waypoint x="2075.0" y="549.9379963898917"></omgdi:waypoint>
+        <omgdi:waypoint x="2075.0" y="613.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1893.0229559271843" y="613.7760497292127"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-7BDC3D2A-5EA5-489B-A1C1-ACD672F5EE72" id="BPMNEdge_sid-7BDC3D2A-5EA5-489B-A1C1-ACD672F5EE72">
         <omgdi:waypoint x="941.0060313742674" y="917.0"></omgdi:waypoint>
@@ -633,9 +623,9 @@
         <omgdi:waypoint x="1573.7851239669421" y="543.3347107438017"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-E29C0DB4-272C-4094-B566-FAE993E6F564" id="BPMNEdge_sid-E29C0DB4-272C-4094-B566-FAE993E6F564">
-        <omgdi:waypoint x="1075.072913872263" y="901.5001434408175"></omgdi:waypoint>
-        <omgdi:waypoint x="1075.5060313742674" y="801.5"></omgdi:waypoint>
-        <omgdi:waypoint x="1013.4560313742674" y="801.7707423580786"></omgdi:waypoint>
+        <omgdi:waypoint x="1075.0052254578782" y="901.5"></omgdi:waypoint>
+        <omgdi:waypoint x="1075.0" y="801.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1013.4560313742674" y="801.5394493179514"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="restartSubscribersFlow" id="BPMNEdge_restartSubscribersFlow">
         <omgdi:waypoint x="189.38770945645908" y="802.431506849315"></omgdi:waypoint>
@@ -667,36 +657,36 @@
         <omgdi:waypoint x="915.0" y="402.2500000000002"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-7569B7CF-BAD8-4F86-9879-88E283BD0E7B" id="BPMNEdge_sid-7569B7CF-BAD8-4F86-9879-88E283BD0E7B">
-        <omgdi:waypoint x="882.4999999998543" y="591.5"></omgdi:waypoint>
-        <omgdi:waypoint x="817.5548250992564" y="591.5"></omgdi:waypoint>
+        <omgdi:waypoint x="961.9475755728528" y="591.4999917820097"></omgdi:waypoint>
+        <omgdi:waypoint x="897.0024006727009" y="591.4999917820097"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-7E794918-D88A-4C75-BBD7-BBAFA727FBF5" id="BPMNEdge_sid-7E794918-D88A-4C75-BBD7-BBAFA727FBF5">
         <omgdi:waypoint x="698.5" y="159.0"></omgdi:waypoint>
         <omgdi:waypoint x="613.95" y="159.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="deleteDiscontinuedServicesFlow" id="BPMNEdge_deleteDiscontinuedServicesFlow">
-        <omgdi:waypoint x="672.0704649098406" y="571.7659069325737"></omgdi:waypoint>
-        <omgdi:waypoint x="671.604825099414" y="539.5"></omgdi:waypoint>
-        <omgdi:waypoint x="558.8048250993918" y="539.841149773071"></omgdi:waypoint>
+        <omgdi:waypoint x="671.8516853725973" y="571.9854727355175"></omgdi:waypoint>
+        <omgdi:waypoint x="671.0" y="539.0"></omgdi:waypoint>
+        <omgdi:waypoint x="558.8048250994069" y="539.6811324715"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="notAllServiceBrokerSubscribersAreRestartedFlow" id="BPMNEdge_notAllServiceBrokerSubscribersAreRestartedFlow">
         <omgdi:waypoint x="627.3755878258802" y="802.4193548387096"></omgdi:waypoint>
         <omgdi:waypoint x="678.5060313742451" y="802.2123481781376"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="allServiceBrokerSubscribersWereRestartedFlow" id="BPMNEdge_allServiceBrokerSubscribersWereRestartedFlow">
-        <omgdi:waypoint x="607.5060313742674" y="822.4419621273166"></omgdi:waypoint>
-        <omgdi:waypoint x="607.5060313742674" y="926.5"></omgdi:waypoint>
-        <omgdi:waypoint x="393.4541758531276" y="923.683537173742"></omgdi:waypoint>
+        <omgdi:waypoint x="607.42441738039" y="822.3685900411072"></omgdi:waypoint>
+        <omgdi:waypoint x="607.0" y="926.0"></omgdi:waypoint>
+        <omgdi:waypoint x="393.4546308974041" y="923.6532919950935"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-5F48B17E-DD8B-4609-86D4-61D2E10DFCC2" id="BPMNEdge_sid-5F48B17E-DD8B-4609-86D4-61D2E10DFCC2">
-        <omgdi:waypoint x="717.6048250993831" y="591.5"></omgdi:waypoint>
-        <omgdi:waypoint x="692.2652559979389" y="591.5"></omgdi:waypoint>
+        <omgdi:waypoint x="797.0523992292387" y="591.4999941317195"></omgdi:waypoint>
+        <omgdi:waypoint x="692.2605105341524" y="591.4999990591753"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-82DC4073-CDBC-47E5-AFC3-B5FFD7AB1499" id="BPMNEdge_sid-82DC4073-CDBC-47E5-AFC3-B5FFD7AB1499">
-        <omgdi:waypoint x="1534.0413983440662" y="543.4540229885057"></omgdi:waypoint>
-        <omgdi:waypoint x="1337.0" y="543.0"></omgdi:waypoint>
-        <omgdi:waypoint x="1337.0" y="595.0"></omgdi:waypoint>
-        <omgdi:waypoint x="1281.45" y="595.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1534.0540865384603" y="543.4399399399399"></omgdi:waypoint>
+        <omgdi:waypoint x="1388.0" y="543.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1388.0" y="591.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1229.8975755732326" y="591.3798317349957"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="shouldDeployModulesSequentialFlow" id="BPMNEdge_shouldDeployModulesSequentialFlow">
         <omgdi:waypoint x="346.25862831858393" y="401.80752212389393"></omgdi:waypoint>
@@ -705,9 +695,9 @@
         <omgdi:waypoint x="477.9999999999492" y="459.1616161616162"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="doNotDeleteDiscontinuedServicesFlow" id="BPMNEdge_doNotDeleteDiscontinuedServicesFlow">
-        <omgdi:waypoint x="672.119530981767" y="611.215294117647"></omgdi:waypoint>
-        <omgdi:waypoint x="671.604825099414" y="654.5"></omgdi:waypoint>
-        <omgdi:waypoint x="557.8048250993972" y="654.8441754916792"></omgdi:waypoint>
+        <omgdi:waypoint x="671.9304796886155" y="611.0267154527284"></omgdi:waypoint>
+        <omgdi:waypoint x="671.0" y="654.0"></omgdi:waypoint>
+        <omgdi:waypoint x="557.8048250994027" y="654.6872061387096"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow10" id="BPMNEdge_flow10">
         <omgdi:waypoint x="1522.0" y="154.0"></omgdi:waypoint>
@@ -755,9 +745,9 @@
         <omgdi:waypoint x="2075.0" y="510.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-FC7F56D7-4472-416D-B028-1ED6095D12A2" id="BPMNEdge_sid-FC7F56D7-4472-416D-B028-1ED6095D12A2">
-        <omgdi:waypoint x="453.85482509938873" y="539.7712418300654"></omgdi:waypoint>
-        <omgdi:waypoint x="391.604825099414" y="539.5"></omgdi:waypoint>
-        <omgdi:waypoint x="391.604825099414" y="610.0"></omgdi:waypoint>
+        <omgdi:waypoint x="453.85482509941136" y="539.544882496638"></omgdi:waypoint>
+        <omgdi:waypoint x="391.0" y="539.0"></omgdi:waypoint>
+        <omgdi:waypoint x="391.0" y="610.0"></omgdi:waypoint>
         <omgdi:waypoint x="222.9560313742674" y="610.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="serviceBrokerSubscriberWasStartedFlow" id="BPMNEdge_serviceBrokerSubscriberWasStartedFlow">
diff --git a/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateStepWithExistingAppTest.java b/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateStepWithExistingAppTest.java
index 81dec8e5a0..78f20b5f65 100644
--- a/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateStepWithExistingAppTest.java
+++ b/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateStepWithExistingAppTest.java
@@ -28,12 +28,17 @@
 import org.cloudfoundry.multiapps.controller.client.lib.domain.ImmutableCloudApplicationExtended;
 import org.cloudfoundry.multiapps.controller.core.Constants;
 import org.cloudfoundry.multiapps.controller.core.cf.clients.AppBoundServiceInstanceNamesGetter;
+import org.cloudfoundry.multiapps.controller.core.model.Phase;
 import org.cloudfoundry.multiapps.controller.core.util.ApplicationURI;
+import org.cloudfoundry.multiapps.controller.persistence.model.ConfigurationSubscription;
+import org.cloudfoundry.multiapps.controller.persistence.query.ConfigurationSubscriptionQuery;
+import org.cloudfoundry.multiapps.controller.persistence.services.ConfigurationSubscriptionService;
 import org.cloudfoundry.multiapps.controller.process.variables.Variables;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Answers;
 import org.mockito.Mock;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -59,6 +64,10 @@ class CreateOrUpdateStepWithExistingAppTest extends SyncFlowableStepTest<CreateO
 
     @Mock
     private AppBoundServiceInstanceNamesGetter appServicesGetter;
+    @Mock
+    private ConfigurationSubscriptionService subscriptionService;
+    @Mock(answer = Answers.RETURNS_SELF)
+    private ConfigurationSubscriptionQuery query;
 
     static Stream<Arguments> testHandleStagingApplicationAttributes() {
         return Stream.of(
@@ -217,7 +226,7 @@ private void prepareClient(CloudApplication application, Set<CloudRoute> routes,
         when(appServicesGetter.getServiceInstanceNamesBoundToApp(any())).thenReturn(services);
         when(client.getApplicationEnvironment(application.getGuid())).thenReturn(env);
         application = prepareAppWithStaging(application, staging);
-        when(client.getApplication(APP_NAME, false)).thenReturn(application);
+        when(client.getApplication(application.getName(), false)).thenReturn(application);
         when(client.getApplicationSshEnabled(application.getGuid())).thenReturn(staging.isSshEnabled() != null && staging.isSshEnabled());
         when(client.getApplicationRoutes(application.getGuid())).thenReturn(List.copyOf(routes));
         String command = staging.getCommand() == null ? DEFAULT_COMMAND : staging.getCommand();
@@ -471,6 +480,32 @@ private Map<String, String> buildExpectedEnvWithDeployAttributes(Map<String, Str
         return expectedEnvMap;
     }
 
+    @Test
+    void testHandleApplicationName() {
+        String idleAppName = APP_NAME + "-idle";
+
+        CloudApplication existingApplication = getApplicationBuilder(false).name(idleAppName)
+                                                                           .build();
+        CloudApplicationExtended application = getApplicationBuilder(false).name(idleAppName)
+                                                                           .build();
+        prepareContext(application, true);
+        context.setVariable(Variables.KEEP_ORIGINAL_APP_NAMES_AFTER_DEPLOY, true);
+        context.setVariable(Variables.PHASE, Phase.AFTER_RESUME);
+        prepareClientWithServices(existingApplication, List.of());
+
+        when(query.list())
+            .thenReturn(List.of(new ConfigurationSubscription(0, "", "", idleAppName, null, null, null, null, null)));
+        when(subscriptionService.createQuery())
+            .thenReturn(query);
+
+        step.execute(execution);
+
+        assertStepFinishedSuccessfully();
+        verify(client).rename(idleAppName, APP_NAME);
+        verify(subscriptionService)
+            .update(any(), eq(new ConfigurationSubscription(0, "", "", APP_NAME, null, null, null, null, null)));
+    }
+
     @Override
     protected CreateOrUpdateAppStep createStep() {
         return new CreateOrUpdateAppStep() {
diff --git a/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/RemoveNewApplicationsSuffixStepTest.java b/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/RemoveNewApplicationsSuffixStepTest.java
deleted file mode 100644
index 2d2acc8f99..0000000000
--- a/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/RemoveNewApplicationsSuffixStepTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.cloudfoundry.multiapps.controller.process.steps;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.cloudfoundry.multiapps.controller.persistence.model.ConfigurationSubscription;
-import org.cloudfoundry.multiapps.controller.persistence.query.ConfigurationSubscriptionQuery;
-import org.cloudfoundry.multiapps.controller.persistence.services.ConfigurationSubscriptionService;
-import org.cloudfoundry.multiapps.controller.process.variables.Variables;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-
-class RemoveNewApplicationsSuffixStepTest extends SyncFlowableStepTest<RemoveNewApplicationsSuffixStep> {
-
-    @Mock
-    private ConfigurationSubscriptionService subscriptionService;
-
-    @Mock(answer = Answers.RETURNS_SELF)
-    private ConfigurationSubscriptionQuery query;
-
-    @BeforeEach
-    void setUp() {
-        context.setVariable(Variables.KEEP_ORIGINAL_APP_NAMES_AFTER_DEPLOY, true);
-        Mockito.when(query.list())
-               .thenReturn(Collections.emptyList());
-        Mockito.when(subscriptionService.createQuery())
-               .thenReturn(query);
-    }
-
-    @Test
-    void testExecuteWithNoAppsToDeploy() {
-        context.setVariable(Variables.APPS_TO_DEPLOY, Collections.emptyList());
-
-        step.execute(execution);
-        assertStepFinishedSuccessfully();
-
-        Mockito.verify(client, Mockito.never())
-               .rename(Mockito.anyString(), Mockito.anyString());
-    }
-
-    @Test
-    void testExecuteRenamesApps() {
-        List<String> apps = List.of("a-idle", "b-idle");
-        context.setVariable(Variables.APPS_TO_DEPLOY, apps);
-
-        step.execute(execution);
-        assertStepFinishedSuccessfully();
-
-        for (String app : apps) {
-            Mockito.verify(client)
-                   .rename(app, removeAppNameSuffix(app));
-        }
-    }
-
-    @Test
-    void testUpdatingOfConfigurationSubscriptions() {
-        Mockito.when(query.list())
-               .thenReturn(List.of(new ConfigurationSubscription(0, "", "", "a-idle", null, null, null, null, null)));
-        Mockito.when(subscriptionService.createQuery())
-               .thenReturn(query);
-
-        context.setVariable(Variables.APPS_TO_DEPLOY, List.of("a-idle"));
-
-        step.execute(execution);
-        assertStepFinishedSuccessfully();
-
-        Mockito.verify(subscriptionService)
-               .update(Mockito.any(), Mockito.eq(new ConfigurationSubscription(0, "", "", "a", null, null, null, null, null)));
-    }
-
-    private static String removeAppNameSuffix(String appName) {
-        return appName.substring(0, appName.lastIndexOf('-'));
-    }
-
-    @Override
-    protected RemoveNewApplicationsSuffixStep createStep() {
-        return new RemoveNewApplicationsSuffixStep();
-    }
-
-}
diff --git a/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util/ArchiveEntryExtractorTest.java b/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util/ArchiveEntryExtractorTest.java
index 746b0808a6..dde1871106 100644
--- a/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util/ArchiveEntryExtractorTest.java
+++ b/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util/ArchiveEntryExtractorTest.java
@@ -1,5 +1,11 @@
 package org.cloudfoundry.multiapps.controller.process.util;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.UUID;
+import java.util.stream.Stream;
+
 import org.apache.commons.io.input.BoundedInputStream;
 import org.cloudfoundry.multiapps.common.ContentException;
 import org.cloudfoundry.multiapps.controller.persistence.services.FileContentConsumer;
@@ -13,12 +19,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.UUID;
-import java.util.stream.Stream;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
@@ -93,7 +93,7 @@ private FileEntryProperties buildFileEntryProperty(long maxFileSizeInBytes) {
     private void assertDeploymentDescriptorAreEqual(String actualDeploymentDescriptor) throws IOException {
         String expectedDeploymentDescriptor = new String(getClass().getResourceAsStream("expected-mtad.yaml")
                                                                    .readAllBytes());
-        assertEquals(expectedDeploymentDescriptor, actualDeploymentDescriptor);
+        assertEquals(expectedDeploymentDescriptor.replace("\r", ""), actualDeploymentDescriptor.replace("\r", ""));
     }
 
     static Stream<Arguments> processFileEntryBytes() {
diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/resources/ApplicationShutdownResource.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/resources/ApplicationShutdownResource.java
index dcfce4e70a..a69b9c5a24 100644
--- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/resources/ApplicationShutdownResource.java
+++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/resources/ApplicationShutdownResource.java
@@ -3,6 +3,7 @@
 import java.text.MessageFormat;
 import java.util.concurrent.CompletableFuture;
 
+import jakarta.inject.Inject;
 import org.cloudfoundry.multiapps.controller.core.Messages;
 import org.cloudfoundry.multiapps.controller.core.model.ApplicationShutdown;
 import org.cloudfoundry.multiapps.controller.core.model.ImmutableApplicationShutdown;
@@ -17,8 +18,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import jakarta.inject.Inject;
-
 @RestController
 @RequestMapping(value = Constants.Resources.APPLICATION_SHUTDOWN)
 public class ApplicationShutdownResource {
@@ -30,17 +29,18 @@ public class ApplicationShutdownResource {
 
     @PostMapping(produces = { MediaType.APPLICATION_JSON_VALUE })
     public ApplicationShutdown
-           shutdownFlowableJobExecutor(@RequestHeader(name = "x-cf-applicationid", required = false) String applicationId,
-                                       @RequestHeader(name = "x-cf-instanceid", required = false) String applicationInstanceId,
-                                       @RequestHeader(name = "x-cf-instanceindex", required = false) String applicationInstanceIndex) {
+    shutdownFlowableJobExecutor(@RequestHeader(name = "x-cf-applicationid", required = false) String applicationId,
+                                @RequestHeader(name = "x-cf-instanceid", required = false) String applicationInstanceId,
+                                @RequestHeader(name = "x-cf-instanceindex", required = false) String applicationInstanceIndex) {
 
         CompletableFuture.runAsync(() -> {
-            LOGGER.info(MessageFormat.format(Messages.APP_SHUTDOWN_REQUEST, applicationId, applicationInstanceId,
-                                             applicationInstanceIndex));
-            flowableFacade.shutdownJobExecutor();
-        })
-                         .thenRun(() -> LOGGER.info(MessageFormat.format(Messages.APP_SHUTDOWNED, applicationId, applicationInstanceId,
-                                                                         applicationInstanceIndex)));
+                             LOGGER.info(MessageFormat.format(Messages.APP_SHUTDOWN_REQUEST, applicationId, applicationInstanceId,
+                                                              applicationInstanceIndex));
+                             flowableFacade.shutdownJobExecutor();
+                         })
+                         .thenRun(() -> LOGGER.info(
+                             MessageFormat.format(Messages.APP_SUCCESSFULLY_SHUTDOWN, applicationId, applicationInstanceId,
+                                                  applicationInstanceIndex)));
 
         return ImmutableApplicationShutdown.builder()
                                            .status(getShutdownStatus())
@@ -56,13 +56,14 @@ private ApplicationShutdown.Status getShutdownStatus() {
 
     @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
     public ApplicationShutdown
-           getFlowableJobExecutorShutdownStatus(@RequestHeader(name = "x-cf-applicationid", required = false) String applicationId,
-                                                @RequestHeader(name = "x-cf-instanceid", required = false) String applicationInstanceId,
-                                                @RequestHeader(name = "x-cf-instanceindex", required = false) String applicationInstanceIndex) {
+    getFlowableJobExecutorShutdownStatus(@RequestHeader(name = "x-cf-applicationid", required = false) String applicationId,
+                                         @RequestHeader(name = "x-cf-instanceid", required = false) String applicationInstanceId,
+                                         @RequestHeader(name = "x-cf-instanceindex", required = false) String applicationInstanceIndex) {
 
         ApplicationShutdown applicationShutdown = ImmutableApplicationShutdown.builder()
                                                                               .status(getShutdownStatus())
-                                                                              .applicationInstanceIndex(Integer.parseInt(applicationInstanceIndex))
+                                                                              .applicationInstanceIndex(
+                                                                                  Integer.parseInt(applicationInstanceIndex))
                                                                               .applicationId(applicationId)
                                                                               .applicationInstanceId(applicationInstanceId)
                                                                               .build();