diff --git a/code/setup/btp-setup-automator/btpsa-deployment.sh b/code/setup/btp-setup-automator/btpsa-deployment.sh
index f8a3e43..a1699c3 100644
--- a/code/setup/btp-setup-automator/btpsa-deployment.sh
+++ b/code/setup/btp-setup-automator/btpsa-deployment.sh
@@ -86,6 +86,37 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
   log "####################################################################################################"
   echo ""
 
+  log "Step 3.1 - Enable BTP Operator"
+  curl -Lo kyma.tar.gz "https://github.com/kyma-project/cli/releases/download/$(curl -s https://api.github.com/repos/kyma-project/cli/releases/latest | grep tag_name | cut -d '"' -f 4)/kyma_Linux_x86_64.tar.gz" \
+  && mkdir kyma-release && tar -C kyma-release -zxvf kyma.tar.gz && chmod +x kyma-release/kyma && sudo mv kyma-release/kyma /usr/local/bin \
+  && rm -rf kyma-release kyma.tar.gz
+
+  kyma alpha enable module btp-operator  --channel regular --kyma-name default --wait
+
+  # Wait for BTP Operator to be ready
+  BTP_OPERATOR_READY=0
+  MAX_RETRIES=30
+  RETRY_INTERVAL=10
+
+  for ((i=1; i<=MAX_RETRIES; i++)); do
+      if kubectl get pods -n kyma-system | grep -q 'btp-operator.*Running'; then
+          BTP_OPERATOR_READY=1
+          break
+      else
+          echo "Waiting for BTP Operator to be ready... retry $i/$MAX_RETRIES"
+          sleep $RETRY_INTERVAL
+      fi
+  done
+
+  if [ $BTP_OPERATOR_READY -eq 0 ]; then
+      echo "BTP Operator is not ready. Exiting..."
+      exit 1
+  else
+      echo "BTP Operator is ready."
+  fi
+
+  echo
+
   log "Step 2.1 - Create Namepaces"  
   kubectl create namespace integration || true
   kubectl create namespace backend || true
diff --git a/code/setup/easyfranchise-deployment.sh b/code/setup/easyfranchise-deployment.sh
index 58cff5b..224c81e 100644
--- a/code/setup/easyfranchise-deployment.sh
+++ b/code/setup/easyfranchise-deployment.sh
@@ -327,6 +327,29 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
       && rm -rf kyma-release kyma.tar.gz
 
       kyma alpha enable module btp-operator  --channel regular --kyma-name default --wait
+
+      # Wait for BTP Operator to be ready
+      BTP_OPERATOR_READY=0
+      MAX_RETRIES=30
+      RETRY_INTERVAL=10
+
+      for ((i=1; i<=MAX_RETRIES; i++)); do
+          if kubectl get pods -n kyma-system | grep -q 'btp-operator.*Running'; then
+              BTP_OPERATOR_READY=1
+              break
+          else
+              echo "Waiting for BTP Operator to be ready... retry $i/$MAX_RETRIES"
+              sleep $RETRY_INTERVAL
+          fi
+      done
+
+      if [ $BTP_OPERATOR_READY -eq 0 ]; then
+          echo "BTP Operator is not ready. Exiting..."
+          exit 1
+      else
+          echo "BTP Operator is ready."
+      fi
+
     else 
       log "Skipped for Dry Run"
     fi