diff --git a/git-repo/create-contract-repo.yaml b/git-repo/create-contract-repo.yaml
index 9363e94d..8fd1cd81 100644
--- a/git-repo/create-contract-repo.yaml
+++ b/git-repo/create-contract-repo.yaml
@@ -69,18 +69,16 @@ spec:
         # For now, this hardcoding seems enough.
         rm -rf aws-reference/openstack aws-reference/decapod-controller aws-reference/admin-tools
         rm -rf byoh-reference/openstack byoh-reference/decapod-controller byoh-reference/admin-tools
-
+        
+        site_list=$(ls -d */ | sed 's/\///g' | egrep "-reference$")
         # Append Keycloak URL and Realm info
         KEYCLOAK_DOMAIN="${KEYCLOAK_URL#https://}"
-        sed -i "/keycloakDomain:/c\  keycloakDomain: ${KEYCLOAK_DOMAIN}" aws-reference/lma/site-values.yaml
-        sed -i "/realms:/c\  realms: ${CONTRACT_ID}" aws-reference/lma/site-values.yaml
-        sed -i "/keycloakDomain:/c\  keycloakDomain: ${KEYCLOAK_DOMAIN}" eks-reference/lma/site-values.yaml
-        sed -i "/realms:/c\  realms: ${CONTRACT_ID}" eks-reference/lma/site-values.yaml
-        sed -i "/keycloakDomain:/c\  keycloakDomain: ${KEYCLOAK_DOMAIN}" aws-msa-reference/lma/site-values.yaml
-        sed -i "/realms:/c\  realms: ${CONTRACT_ID}" aws-msa-reference/lma/site-values.yaml
-        sed -i "/keycloakDomain:/c\  keycloakDomain: ${KEYCLOAK_DOMAIN}" eks-msa-reference/lma/site-values.yaml
-        sed -i "/realms:/c\  realms: ${CONTRACT_ID}" eks-msa-reference/lma/site-values.yaml
-        
+        for site in ${site_list}
+        do
+          sed -i "/keycloakDomain:/c\  keycloakDomain: ${KEYCLOAK_DOMAIN}" ${site}/lma/site-values.yaml
+          sed -i "/realms:/c\  realms: ${CONTRACT_ID}" ${site}/lma/site-values.yaml
+        done
+      
         git config --global user.email "taco_support@sk.com"
         git config --global user.name "SKTelecom TACO"
         git add .
diff --git a/tks-cluster/remove-usercluster-wftpl.yaml b/tks-cluster/remove-usercluster-wftpl.yaml
index c6ef9b4d..ae4ce933 100644
--- a/tks-cluster/remove-usercluster-wftpl.yaml
+++ b/tks-cluster/remove-usercluster-wftpl.yaml
@@ -68,8 +68,7 @@ spec:
             - name: app_name
               value: "{{workflow.parameters.app_prefix}}-cluster-autoscaler"
         when: >-
-            {{steps.findInfraProvider.outputs.parameters.infra_provider}} != byoh &&
-              {{steps.findInfraProvider.outputs.parameters.managed_cluster}} == false
+            {{steps.findInfraProvider.outputs.parameters.infra_provider}} != byoh
 
     - - name: deleteClusterAutoscalerRbacApp
         templateRef: