diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9333eed02626b3c3de1e7ddea90c1875694d4d5c..f4cb4deb0061da5d2a3c6e4c3a8f4dbd607ed77d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -189,6 +189,7 @@ stages:
   - build
   - create-vps
   - setup-cluster
+  - configure-cluster
   - kustomization
   - install-apps
   - apps-kustomizations-ready
@@ -351,6 +352,23 @@ setup-stackspin:
     - kubectl apply -n cert-manager -f ./install/overrides/stackspin-cert-manager-override.yaml
     # Install flux and general, non-app specific secrets
     - bash ./install/install-stackspin.sh
+  extends:
+    - .ssh_setup
+    - .report_artifacts
+    - .general_rules
+  interruptible: true
+
+
+# Stage: configure-cluster
+# ====================
+#
+# Configure cluster after basic installation
+# i.e. CI-related config like zerossl clusterIssuer
+
+configure-stackspin:
+  stage: configure-cluster
+  script:
+    - *debug_information
     # Install custom ClusterIssuer for ZeroSSL production certificates
     - bash ./.gitlab/ci_scripts/install_zerossl_issuer.sh
   extends:
@@ -360,6 +378,8 @@ setup-stackspin:
   interruptible: true
 
 
+
+
 # Stage: kustomization
 # ====================
 #