diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0832616985599aa6abcdd631224d231ee447a913..f06a66672b19e9245b8dc3f2f12c4ef53c9e8b68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,20 @@ stages:
   - dast
   - deploy
 
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_OPEN_MERGE_REQUESTS
+      when: never
+    - if: $CI_COMMIT_BRANCH
+
 variables:
     TO_PACKAGE: 'appinfo l10n lib templates js img css'
+    CONTAINER_IMAGE: ubuntu
+    CONTAINER_TAG: focal
+    CONTAINER_NAME: nextcloud
+    APP_NAME: $CI_PROJECT_NAME
+    OCC_ENABLE_AFTER_DEPLOY: 'true'
+    APP_PATH: ''
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
@@ -24,16 +36,19 @@ include:
     ref: main
     file: "populate-code-climate-default-config.yml"
 
-build-vendor:
-  stage: build
-  extends: .composer:base
-  needs: ["build-frontend"]
-  before_script:
-    - composer install --no-dev
-  script:
-    - cp -a vendor dist/${APP_NAME}
-    - find dist/${APP_NAME} -type d -exec chmod 755 {} \;
-    - find dist/${APP_NAME} -type f -exec chmod 644 {} \;
-  artifacts:
-    paths:
-      - dist/
+deploy:staging:
+  extends: .deploy:nextcloud-app
+  rules:
+    - if: $CI_COMMIT_BRANCH == "main"
+      when: manual
+    - if: $CI_COMMIT_BRANCH == "murena-main"
+      when: manual
+    - if: $CI_COMMIT_BRANCH == "production"
+      when: manual
+    - if: $CI_COMMIT_BRANCH == "dev/fix-loader-issue"
+      when: manual   
+    - if: $CI_COMMIT_TAG
+      when: manual
+  environment:
+    name: staging/01
+    url: $ENV_URL
diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 7c28a59cb771d8302a675b48ac2450226baebe43..2960b387757cd97a0c4e8045ab0f4ff2e2a23410 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -59,7 +59,7 @@
 				</form>
 			</div>
 		</SettingsSection>
-		<div id="delete-my-account-loader" class="spinner-container">
+		<div v-if="loading" id="delete-my-account-loader" class="spinner-container">
 			<NcLoadingIcon :size="40" />
 		</div>
 	</div>
@@ -93,6 +93,7 @@ export default {
 			showError: false,
 			allowDelete: true,
 			ordersDescription: '',
+			loading: true,
 		}
 	},
 	computed: {
@@ -179,6 +180,7 @@ export default {
 					this.allowDelete = false
 				}
 			}
+			this.loading = false
 			this.disableOrEnableDeleteAccount()
 		},
 		async updateDeleteShopPreference() {