diff --git a/datasource.tf b/datasource.tf
index f6fada1e..4f893a4a 100644
--- a/datasource.tf
+++ b/datasource.tf
@@ -20,3 +20,33 @@ data "ibm_is_subnet" "itself" {
   identifier = local.subnets[count.index]["id"]
 }
 */
+
+data "ibm_resource_group" "resource_group" {
+  count = var.resource_group == null ? 0 : 1
+  name  = var.resource_group
+}
+
+data "ibm_is_subnet" "existing_compute_subnets" {
+  count = var.vpc != null && var.compute_subnets != null ? 1 : 0
+  name  = var.compute_subnets[count.index]
+}
+
+data "ibm_is_subnet" "existing_storage_subnets" {
+  count = var.vpc != null && var.storage_subnets != null ? 1 : 0
+  name  = var.storage_subnets[count.index]
+}
+
+data "ibm_is_subnet" "existing_protocol_subnets" {
+  count = var.vpc != null && var.protocol_subnets != null ? 1 : 0
+  name  = var.protocol_subnets[count.index]
+}
+
+data "ibm_is_subnet" "existing_client_subnets" {
+  count = var.vpc != null && var.client_subnets != null ? 1 : 0
+  name  = var.client_subnets[count.index]
+}
+
+data "ibm_is_subnet" "existing_bastion_subnets" {
+  count = var.vpc != null && var.bastion_subnets != null ? 1 : 0
+  name  = var.bastion_subnets[count.index]
+}
\ No newline at end of file
diff --git a/locals.tf b/locals.tf
index 537c3d38..11f5390d 100644
--- a/locals.tf
+++ b/locals.tf
@@ -15,12 +15,13 @@ locals {
 # locals needed for deployer
 locals {
   # dependency: landing_zone -> deployer
-  vpc_id                     = var.vpc == null ? one(module.landing_zone.vpc_id) : var.vpc
+  vpc_id                     = var.vpc == null ? one(module.landing_zone.vpc_id) : var.vpc_id
+  vpc                        = var.vpc == null ? one(module.landing_zone.vpc_name) : var.vpc
   bastion_subnets            = module.landing_zone.bastion_subnets
   kms_encryption_enabled     = var.key_management != null ? true : false
   boot_volume_encryption_key = var.key_management != null ? one(module.landing_zone.boot_volume_encryption_key)["crn"] : null
   existing_kms_instance_guid = var.key_management != null ? module.landing_zone.key_management_guid : null
-  cos_data                   = module.landing_zone.cos_buckets_data
+  cos_data                   = var.enable_bastion ? [] : module.landing_zone.cos_buckets_data
   # Future use
   # skip_iam_authorization_policy = true
 }
@@ -29,14 +30,78 @@ locals {
 # locals needed for landing_zone_vsi
 locals {
   # dependency: landing_zone -> deployer -> landing_zone_vsi
-  bastion_security_group_id  = module.deployer.bastion_security_group_id
-  bastion_public_key_content = module.deployer.bastion_public_key_content
+  bastion_security_group_id   = module.deployer.bastion_security_group_id
+  bastion_public_key_content  = module.deployer.bastion_public_key_content
+  bastion_private_key_content = module.deployer.bastion_private_key_content
+
+  deployer_hostname = var.enable_bastion ? flatten(module.deployer.deployer_vsi_data[*].list)[0].name : ""
+  deployer_ip = module.deployer.deployer_ip
+
+  compute_public_key_contents  = module.deployer.compute_public_key_content
+  compute_private_key_contents = module.deployer.compute_private_key_content
+
+  # Existing subnets details
+  existing_compute_subnets = [
+    for subnet in data.ibm_is_subnet.existing_compute_subnets :
+    {
+      cidr = subnet.ipv4_cidr_block
+      id   = subnet.id
+      name = subnet.name
+      zone = subnet.zone
+    }
+  ]
+
+  existing_storage_subnets = [
+    for subnet in data.ibm_is_subnet.existing_storage_subnets :
+    {
+      cidr = subnet.ipv4_cidr_block
+      id   = subnet.id
+      name = subnet.name
+      zone = subnet.zone
+    }
+  ]
+
+  existing_protocol_subnets = [
+    for subnet in data.ibm_is_subnet.existing_protocol_subnets :
+    {
+      cidr = subnet.ipv4_cidr_block
+      id   = subnet.id
+      name = subnet.name
+      zone = subnet.zone
+    }
+  ]
+
+  existing_client_subnets = [
+    for subnet in data.ibm_is_subnet.existing_client_subnets :
+    {
+      cidr = subnet.ipv4_cidr_block
+      id   = subnet.id
+      name = subnet.name
+      zone = subnet.zone
+    }
+  ]
+
+    existing_bastion_subnets = [
+    for subnet in data.ibm_is_subnet.existing_bastion_subnets :
+    {
+      cidr = subnet.ipv4_cidr_block
+      id   = subnet.id
+      name = subnet.name
+      zone = subnet.zone
+    }
+  ]
 
   # dependency: landing_zone -> landing_zone_vsi
-  client_subnets   = module.landing_zone.client_subnets
-  compute_subnets  = module.landing_zone.compute_subnets
-  storage_subnets  = module.landing_zone.storage_subnets
-  protocol_subnets = module.landing_zone.protocol_subnets
+  client_subnets   = var.vpc != null && var.client_subnets != null ? local.existing_client_subnets : module.landing_zone.client_subnets
+  compute_subnets  = var.vpc != null && var.compute_subnets != null ? local.existing_compute_subnets : module.landing_zone.compute_subnets
+  storage_subnets  = var.vpc != null && var.storage_subnets != null ? local.existing_storage_subnets : module.landing_zone.storage_subnets
+  protocol_subnets = var.vpc != null && var.protocol_subnets != null ? local.existing_protocol_subnets : module.landing_zone.protocol_subnets
+
+  storage_subnet  = [for subnet in local.storage_subnets : subnet.name]
+  protocol_subnet = [for subnet in local.protocol_subnets : subnet.name]
+  compute_subnet  = [for subnet in local.compute_subnets : subnet.name]
+  client_subnet   = [for subnet in local.client_subnets : subnet.name]
+  bastion_subnet  = [for subnet in local.bastion_subnets : subnet.name]
 
   #boot_volume_encryption_key = var.key_management != null ? one(module.landing_zone.boot_volume_encryption_key)["crn"] : null
   #skip_iam_authorization_policy = true
@@ -52,8 +117,8 @@ locals {
   #boot_volume_encryption_key    = var.key_management != null ? one(module.landing_zone.boot_volume_encryption_key)["crn"] : null
 
   # dependency: landing_zone_vsi -> file-share
-  compute_subnet_id         = local.compute_subnets[0].id
-  compute_security_group_id = module.landing_zone_vsi.compute_sg_id
+  compute_subnet_id         = var.vpc == null && var.compute_subnets == null ? local.compute_subnets[0].id : [for subnet in data.ibm_is_subnet.existing_compute_subnets : subnet.id][0]
+  compute_security_group_id = var.enable_deployer ? [] : module.landing_zone_vsi[0].compute_sg_id
   management_instance_count = sum(var.management_instances[*]["count"])
   default_share = local.management_instance_count > 0 ? [
     {
@@ -77,39 +142,65 @@ locals {
 # locals needed for DNS
 locals {
   # dependency: landing_zone -> DNS
-  resource_group_id = one(values(one(module.landing_zone.resource_group_id)))
+  resource_group = var.resource_group == null ? "workload-rg" : var.resource_group
+  resource_group_ids = {
+    # management_rg = var.resource_group == null ? module.landing_zone.resource_group_id[0]["management-rg"] : one(values(one(module.landing_zone.resource_group_id)))
+    service_rg  = var.resource_group == null ? module.landing_zone.resource_group_id[0]["service-rg"] : data.ibm_resource_group.resource_group[0].id
+    workload_rg = var.resource_group == null ? module.landing_zone.resource_group_id[0]["workload-rg"] : data.ibm_resource_group.resource_group[0].id
+  }
+  # resource_group_id = one(values(one(module.landing_zone.resource_group_id)))
   vpc_crn           = var.vpc == null ? one(module.landing_zone.vpc_crn) : one(data.ibm_is_vpc.itself[*].crn)
   # TODO: Fix existing subnet logic
   #subnets_crn       = var.vpc == null ? module.landing_zone.subnets_crn : ###
+  existing_compute_subnet_crns  = [for subnet in data.ibm_is_subnet.existing_compute_subnets : subnet.crn]
+  existing_storage_subnet_crns  = [for subnet in data.ibm_is_subnet.existing_storage_subnets : subnet.crn]
+  existing_protocol_subnet_crns = [for subnet in data.ibm_is_subnet.existing_protocol_subnets : subnet.crn]
+  existing_client_subnet_crns   = [for subnet in data.ibm_is_subnet.existing_client_subnets : subnet.crn]
+  existing_bastion_subnet_crns  = [for subnet in data.ibm_is_subnet.existing_bastion_subnets : subnet.crn]
+  subnets_crn = concat(local.existing_compute_subnet_crns, local.existing_storage_subnet_crns, local.existing_protocol_subnet_crns, local.existing_client_subnet_crns, local.existing_bastion_subnet_crns)
+  # subnets_crn        = var.vpc == null && var.compute_subnets == null ? module.landing_zone.subnets_crn : concat(local.existing_subnet_crns, module.landing_zone.subnets_crn)
   #subnets           = flatten([local.compute_subnets, local.storage_subnets, local.protocol_subnets])
   #subnets_crns      = data.ibm_is_subnet.itself[*].crn
-  subnets_crn = module.landing_zone.subnets_crn
+  # subnets_crn = module.landing_zone.subnets_crn
   #boot_volume_encryption_key    = var.key_management != null ? one(module.landing_zone.boot_volume_encryption_key)["crn"] : null
 
   # dependency: landing_zone_vsi -> file-share
 }
 
+data "external" "get_hostname" {
+  program = ["sh", "-c", "echo '{\"name\": \"'$(hostname)'\", \"ipv4_address\": \"'$(hostname -I | awk '{print $1}')'\"}'"]
+}
+
+
 # locals needed for dns-records
 locals {
   # dependency: dns -> dns-records
-  dns_instance_id = module.dns.dns_instance_id
+  dns_instance_id = var.enable_deployer ? "" : module.dns[0].dns_instance_id
+  dns_custom_resolver_id = var.enable_deployer ? "" : module.dns[0].dns_custom_resolver_id
+  dns_zone_map_list = var.enable_deployer ? [] : module.dns[0].dns_zone_maps
   compute_dns_zone_id = one(flatten([
-    for dns_zone in module.dns.dns_zone_maps : values(dns_zone) if one(keys(dns_zone)) == var.dns_domain_names["compute"]
+    for dns_zone in local.dns_zone_map_list : values(dns_zone) if one(keys(dns_zone)) == var.dns_domain_names["compute"]
   ]))
   storage_dns_zone_id = one(flatten([
-    for dns_zone in module.dns.dns_zone_maps : values(dns_zone) if one(keys(dns_zone)) == var.dns_domain_names["storage"]
+    for dns_zone in local.dns_zone_map_list : values(dns_zone) if one(keys(dns_zone)) == var.dns_domain_names["storage"]
   ]))
   protocol_dns_zone_id = one(flatten([
-    for dns_zone in module.dns.dns_zone_maps : values(dns_zone) if one(keys(dns_zone)) == var.dns_domain_names["protocol"]
+    for dns_zone in local.dns_zone_map_list : values(dns_zone) if one(keys(dns_zone)) == var.dns_domain_names["protocol"]
   ]))
 
   # dependency: landing_zone_vsi -> dns-records
-  compute_instances  = flatten([module.landing_zone_vsi.management_vsi_data, module.landing_zone_vsi.compute_vsi_data])
-  storage_instances  = flatten([module.landing_zone_vsi.storage_vsi_data, module.landing_zone_vsi.protocol_vsi_data])
-  protocol_instances = flatten([module.landing_zone_vsi.protocol_vsi_data])
+  compute_instances  = var.enable_deployer ? [] : flatten([module.landing_zone_vsi[0].management_vsi_data, module.landing_zone_vsi[0].compute_vsi_data])
+  storage_instances  = var.enable_deployer ? [] : flatten([module.landing_zone_vsi[0].storage_vsi_data, module.landing_zone_vsi[0].protocol_vsi_data])
+  protocol_instances = var.enable_deployer ? [] : flatten([module.landing_zone_vsi[0].protocol_vsi_data])
+  deployer_instances = [
+    {
+      name         = var.deployer_hostname
+      ipv4_address = var.deployer_ip
+    }
+  ]
 
   compute_dns_records = [
-    for instance in local.compute_instances :
+    for instance in concat(local.compute_instances, local.deployer_instances):
     {
       name  = instance["name"]
       rdata = instance["ipv4_address"]
@@ -133,22 +224,63 @@ locals {
 
 # locals needed for inventory
 locals {
-  compute_hosts          = try([for name in local.compute_instances[*]["name"] : "${name}.${var.dns_domain_names["compute"]}"], [])  #local.compute_instances[*]["ipv4_address"]
-  storage_hosts          = try([for name in local.storage_instances[*]["name"] : "${name}.${var.dns_domain_names["storage"]}"], [])  #local.storage_instances[*]["ipv4_address"]
-  compute_inventory_path = "./../../modules/ansible-roles/compute.ini"
-  storage_inventory_path = "./../../modules/ansible-roles/storage.ini"
+  compute_hosts          = try([for name in local.compute_instances[*]["name"] : "${name}.${var.dns_domain_names["compute"]}"], []) #concat(["${data.external.get_hostname.result["name"]}.${var.dns_domain_names["compute"]}"], try([for name in local.compute_instances[*]["name"] : "${name}.${var.dns_domain_names["compute"]}"], []))
+  storage_hosts          = try([for name in local.storage_instances[*]["name"] : "${name}.${var.dns_domain_names["storage"]}"], [])
+  compute_inventory_path = var.enable_bastion ? "${path.root}/../../modules/ansible-roles/compute.ini" : "${path.root}/modules/ansible-roles/compute.ini"
+  storage_inventory_path = var.enable_bastion ? "${path.root}/../../modules/ansible-roles/storage.ini" : "${path.root}/modules/ansible-roles/storage.ini"
 }
 
 # locals needed for playbook
 locals {
   bastion_fip              = module.deployer.bastion_fip
-  compute_private_key_path = "./../../modules/ansible-roles/compute_id_rsa" #checkov:skip=CKV_SECRET_6
-  storage_private_key_path = "./../../modules/ansible-roles/storage_id_rsa" #checkov:skip=CKV_SECRET_6
-  compute_playbook_path    = "./../../modules/ansible-roles/compute_ssh.yaml"
-  storage_playbook_path    = "./../../modules/ansible-roles/storage_ssh.yaml"
+  compute_private_key_path = var.enable_bastion ? "${path.root}/../../modules/ansible-roles/compute_id_rsa" : "${path.root}/modules/ansible-roles/compute_id_rsa" #checkov:skip=CKV_SECRET_6
+  storage_private_key_path = var.enable_bastion ? "${path.root}/../../modules/ansible-roles/storage_id_rsa" : "${path.root}/modules/ansible-roles/storage_id_rsa" #checkov:skip=CKV_SECRET_6
+  compute_playbook_path    = var.enable_bastion ? "${path.root}/../../modules/ansible-roles/compute_ssh.yaml" : "${path.root}/modules/ansible-roles/compute_ssh.yaml" 
+  storage_playbook_path    = var.enable_bastion ? "${path.root}/../../modules/ansible-roles/storage_ssh.yaml" : "${path.root}/modules/ansible-roles/storage_ssh.yaml"
 }
 
 # file Share OutPut
 locals {
-  fileshare_name_mount_path_map = module.file_storage.name_mount_path_map
+  fileshare_name_mount_path_map =  var.enable_deployer ? {} : module.file_storage[0].name_mount_path_map
+}
+
+# details needed for json file
+locals {
+  json_inventory_path   = var.enable_bastion ?  "${path.root}/../../modules/ansible-roles/all.json" : "${path.root}/modules/ansible-roles/all.json"
+  management_nodes      = var.enable_deployer ? [] : (flatten([module.landing_zone_vsi[0].management_vsi_data]))[*]["name"]
+  compute_nodes         = var.enable_deployer ? [] : (flatten([module.landing_zone_vsi[0].compute_vsi_data]))[*]["name"]
+  client_nodes          = var.enable_deployer ? [] : (flatten([module.landing_zone_vsi[0].client_vsi_data]))[*]["name"]
+  gui_hosts             = var.enable_deployer ? [] : [local.management_nodes[0]] # Without Pac HA
+  db_hosts              = var.enable_deployer ? [] : [local.management_nodes[0]] # Without Pac HA
+  ha_shared_dir         = "/mnt/lsf/shared"
+  nfs_install_dir       = "none"
+  Enable_Monitoring     = false
+  lsf_deployer_hostname = var.deployer_hostname #data.external.get_hostname.result.name  #var.enable_bastion ? "" : flatten(module.deployer.deployer_vsi_data[*].list)[0].name
 }
+
+locals {
+  schematics_inputs_path    = "/tmp/.schematics/solution_terraform.auto.tfvars.json"
+  remote_inputs_path        = format("%s/terraform.tfvars.json", "/tmp")
+  deployer_path             = "/opt/ibm"
+  remote_terraform_path     = format("%s/terraform-ibm-hpc", local.deployer_path)
+  remote_ansible_path       = format("%s/terraform-ibm-hpc", local.deployer_path)
+  da_hpc_repo_url           = "https://github.com/terraform-ibm-modules/terraform-ibm-hpc.git"
+  da_hpc_repo_tag           = "jay_lsf_scale_deployer" ###### change it to main in future
+  zones                     = jsonencode(var.zones)
+  list_compute_ssh_keys     = jsonencode(local.compute_ssh_keys)
+  list_storage_ssh_keys     = jsonencode(local.storage_ssh_keys)
+  list_storage_instances    = jsonencode(var.storage_instances)
+  list_management_instances = jsonencode(var.management_instances)
+  list_protocol_instances   = jsonencode(var.protocol_instances)
+  list_compute_instances    = jsonencode(var.static_compute_instances)
+  list_client_instances     = jsonencode(var.client_instances)
+  allowed_cidr              = jsonencode(var.allowed_cidr)
+  list_storage_subnets      = jsonencode(length(local.storage_subnet) == 0 ? null : local.storage_subnet)
+  list_protocol_subnets     = jsonencode(length(local.protocol_subnet) == 0 ? null : local.protocol_subnet)
+  list_compute_subnets      = jsonencode(length(local.compute_subnet) == 0 ? null : local.compute_subnet)
+  list_client_subnets       = jsonencode(length(local.client_subnet) == 0 ? null : local.client_subnet)
+  list_bastion_subnets      = jsonencode(length(local.bastion_subnet) == 0 ? null : local.bastion_subnet)
+  dns_domain_names          = jsonencode(var.dns_domain_names)
+  compute_public_key_content  = local.compute_public_key_contents != null ? jsonencode(base64encode(local.compute_public_key_contents)) : ""
+  compute_private_key_content = local.compute_private_key_contents != null ? jsonencode(base64encode(local.compute_private_key_contents)) : ""
+}
\ No newline at end of file
diff --git a/main.tf b/main.tf
index 43846e34..c34e1a7a 100644
--- a/main.tf
+++ b/main.tf
@@ -1,5 +1,6 @@
 module "landing_zone" {
   source                        = "./modules/landing_zone"
+  enable_landing_zone           = var.enable_landing_zone
   allowed_cidr                  = var.allowed_cidr
   compute_subnets_cidr          = var.compute_subnets_cidr
   clusters                      = var.clusters
@@ -55,16 +56,23 @@ module "deployer" {
   boot_volume_encryption_key    = local.boot_volume_encryption_key
   existing_kms_instance_guid    = local.existing_kms_instance_guid
   skip_iam_authorization_policy = var.skip_iam_authorization_policy
+  static_compute_instances      = var.static_compute_instances
+  management_instances          = var.management_instances
+  dns_domain_names              = var.dns_domain_names
+
 }
 
 module "landing_zone_vsi" {
+  count                      = var.enable_deployer == false ? 1 : 0
   source                     = "./modules/landing_zone_vsi"
   resource_group             = var.resource_group
   prefix                     = var.prefix
   zones                      = var.zones
   vpc_id                     = local.vpc_id
-  bastion_security_group_id  = local.bastion_security_group_id
+  bastion_security_group_id  = var.bastion_security_group_id
   bastion_public_key_content = local.bastion_public_key_content
+  compute_public_key_content = var.compute_public_key_content
+  compute_private_key_content= var.compute_private_key_content
   client_subnets             = local.client_subnets
   client_ssh_keys            = local.client_ssh_keys
   client_instances           = var.client_instances
@@ -82,12 +90,126 @@ module "landing_zone_vsi" {
   dns_domain_names           = var.dns_domain_names
   kms_encryption_enabled     = local.kms_encryption_enabled
   boot_volume_encryption_key = local.boot_volume_encryption_key
+  enable_bastion             = var.enable_bastion
+}
+
+
+resource "local_sensitive_file" "prepare_tf_input" {
+  count    = var.enable_deployer == true ? 1 : 0
+  content  = <<EOT
+{
+  "ibmcloud_api_key": "${var.ibmcloud_api_key}",
+  "resource_group": "${var.resource_group}",
+  "prefix": "${var.prefix}",
+  "zones": ${local.zones},
+  "enable_landing_zone": false,
+  "enable_deployer": false,
+  "enable_bastion": false,
+  "bastion_fip": "${local.bastion_fip}",
+  "compute_ssh_keys": ${local.list_compute_ssh_keys},
+  "storage_ssh_keys": ${local.list_storage_ssh_keys},
+  "storage_instances": ${local.list_storage_instances},
+  "management_instances": ${local.list_management_instances},
+  "protocol_instances": ${local.list_protocol_instances},
+  "ibm_customer_number": "${var.ibm_customer_number}",
+  "static_compute_instances": ${local.list_compute_instances},
+  "client_instances": ${local.list_client_instances},
+  "enable_cos_integration": ${var.enable_cos_integration},
+  "enable_atracker": ${var.enable_atracker},
+  "enable_vpc_flow_logs": ${var.enable_vpc_flow_logs},
+  "allowed_cidr": ${local.allowed_cidr},
+  "vpc_id": "${local.vpc_id}",
+  "vpc": "${local.vpc}",
+  "storage_subnets": ${local.list_storage_subnets},
+  "protocol_subnets": ${local.list_protocol_subnets},
+  "compute_subnets": ${local.list_compute_subnets},
+  "client_subnets": ${local.list_client_subnets},
+  "bastion_subnets": ${local.list_bastion_subnets},
+  "dns_domain_names": ${local.dns_domain_names},
+  "compute_public_key_content": ${local.compute_public_key_content},
+  "compute_private_key_content": ${local.compute_private_key_content},
+  "bastion_security_group_id": "${local.bastion_security_group_id}",
+  "deployer_hostname": "${local.deployer_hostname}",
+  "deployer_ip": "${local.deployer_ip}"
+}    
+EOT
+  filename = local.schematics_inputs_path
+}
+
+resource "null_resource" "tf_resource_provisioner" {
+  count = var.enable_deployer == true ? 1 : 0
+  connection {
+    type                = "ssh"
+    host                = flatten(module.deployer.deployer_vsi_data[*].list)[0].ipv4_address
+    user                = "vpcuser"
+    private_key         = local.bastion_private_key_content
+    bastion_host        = local.bastion_fip
+    bastion_user        = "ubuntu"
+    bastion_private_key = local.bastion_private_key_content
+    timeout             = "60m"
+  }
+
+  provisioner "file" {
+    source      = local.schematics_inputs_path
+    destination = local.remote_inputs_path
+  }
+
+  provisioner "remote-exec" {
+    inline = [
+      "if [ ! -d ${local.remote_terraform_path} ]; then sudo git clone -b ${local.da_hpc_repo_tag} ${local.da_hpc_repo_url} ${local.remote_terraform_path}; fi",
+      "sudo ln -fs /usr/local/bin/ansible-playbook /usr/bin/ansible-playbook",
+      "sudo cp ${local.remote_inputs_path} ${local.remote_terraform_path}",
+      "export TF_LOG=${var.TF_LOG} && sudo -E terraform -chdir=${local.remote_terraform_path} init && sudo -E terraform -chdir=${local.remote_terraform_path} apply -parallelism=${var.TF_PARALLELISM} -auto-approve"
+    ]
+  }
+
+  triggers = {
+    always_run = timestamp()
+  }
+
+  depends_on = [
+    module.deployer,
+    local_sensitive_file.prepare_tf_input
+  ]
+}
+
+resource "null_resource" "cluster_destroyer" {
+  count    = var.enable_deployer == true ? 1 : 0
+  triggers = {
+    conn_host                  = flatten(module.deployer.deployer_vsi_data[*].list)[0].ipv4_address
+    conn_private_key           = local.bastion_private_key_content
+    conn_bastion_host          = local.bastion_fip
+    conn_bastion_private_key   = local.bastion_private_key_content
+    conn_ibmcloud_api_key      = var.ibmcloud_api_key
+    conn_remote_terraform_path = local.remote_terraform_path
+    conn_terraform_log_level   = var.TF_LOG
+  }
+
+  connection {
+    type                = "ssh"
+    host                = self.triggers.conn_host
+    user                = "vpcuser"
+    private_key         = self.triggers.conn_private_key
+    bastion_host        = self.triggers.conn_bastion_host
+    bastion_user        = "ubuntu"
+    bastion_private_key = self.triggers.conn_bastion_private_key
+    timeout             = "60m"
+  }
+
+  provisioner "remote-exec" {
+    when       = destroy
+    on_failure = fail
+    inline = [
+      "export TF_LOG=${self.triggers.conn_terraform_log_level} && sudo -E terraform -chdir=${self.triggers.conn_remote_terraform_path} destroy -auto-approve"
+    ]
+  }
 }
 
 module "file_storage" {
+  count              = var.enable_deployer == false ? 1 : 0 
   source             = "./modules/file_storage"
   zone               = var.zones[0] # always the first zone
-  resource_group_id  = local.resource_group_id
+  resource_group_id  = local.resource_group_ids["service_rg"]
   file_shares        = local.file_shares
   encryption_key_crn = local.boot_volume_encryption_key
   security_group_ids = local.compute_security_group_id
@@ -95,9 +217,10 @@ module "file_storage" {
 }
 
 module "dns" {
+  count                  = var.enable_deployer == false ? 1 : 0
   source                 = "./modules/dns"
   prefix                 = var.prefix
-  resource_group_id      = local.resource_group_id
+  resource_group_id      = local.resource_group_ids["service_rg"]
   vpc_crn                = local.vpc_crn
   subnets_crn            = local.subnets_crn
   dns_instance_id        = var.dns_instance_id
@@ -106,24 +229,30 @@ module "dns" {
 }
 
 module "compute_dns_records" {
+  count           = var.enable_deployer == false ? 1 : 0
   source          = "./modules/dns_record"
   dns_instance_id = local.dns_instance_id
   dns_zone_id     = local.compute_dns_zone_id
   dns_records     = local.compute_dns_records
+  depends_on      = [ module.dns ]
 }
 
 module "storage_dns_records" {
+  count           = var.enable_deployer == false ? 1 : 0
   source          = "./modules/dns_record"
   dns_instance_id = local.dns_instance_id
   dns_zone_id     = local.storage_dns_zone_id
   dns_records     = local.storage_dns_records
+  depends_on      = [ module.dns ]
 }
 
 module "protocol_dns_records" {
+  count           = var.enable_deployer == false ? 1 : 0
   source          = "./modules/dns_record"
   dns_instance_id = local.dns_instance_id
   dns_zone_id     = local.protocol_dns_zone_id
   dns_records     = local.protocol_dns_records
+  depends_on      = [ module.dns ]
 }
 
 resource "time_sleep" "wait_60_seconds" {
@@ -131,40 +260,79 @@ resource "time_sleep" "wait_60_seconds" {
   depends_on          = [ module.storage_dns_records, module.protocol_dns_records, module.compute_dns_records ]
 }
 
+module "write_compute_cluster_inventory" {
+  count                 = var.enable_deployer == false ? 1 : 0 
+  source                = "./modules/write_inventory"
+  json_inventory_path   = local.json_inventory_path
+  lsf_masters           = local.management_nodes
+  lsf_servers           = local.compute_nodes
+  lsf_clients           = local.client_nodes
+  gui_hosts             = local.gui_hosts
+  db_hosts              = local.db_hosts
+  my_cluster_name       = var.prefix
+  ha_shared_dir         = local.ha_shared_dir
+  nfs_install_dir       = local.nfs_install_dir
+  Enable_Monitoring     = local.Enable_Monitoring
+  lsf_deployer_hostname = local.lsf_deployer_hostname
+  depends_on            = [ time_sleep.wait_60_seconds ]
+}
+
+module "write_storage_cluster_inventory" {
+  count                 = var.enable_deployer == false ? 1 : 0 
+  source                = "./modules/write_inventory"
+  json_inventory_path   = local.json_inventory_path
+  lsf_masters           = local.management_nodes
+  lsf_servers           = local.compute_nodes
+  lsf_clients           = local.client_nodes
+  gui_hosts             = local.gui_hosts
+  db_hosts              = local.db_hosts
+  my_cluster_name       = var.prefix
+  ha_shared_dir         = local.ha_shared_dir
+  nfs_install_dir       = local.nfs_install_dir
+  Enable_Monitoring     = local.Enable_Monitoring
+  lsf_deployer_hostname = local.lsf_deployer_hostname
+  depends_on            = [ time_sleep.wait_60_seconds ]
+}
 
 module "compute_inventory" {
+  count               = var.enable_deployer == false ? 1 : 0
   source              = "./modules/inventory"
   hosts               = local.compute_hosts
   inventory_path      = local.compute_inventory_path
   name_mount_path_map = local.fileshare_name_mount_path_map
-  depends_on          = [ time_sleep.wait_60_seconds ]
+  depends_on          = [ module.write_compute_cluster_inventory ]
 }
 
 module "storage_inventory" {
+  count               = var.enable_deployer == false ? 1 : 0
   source              = "./modules/inventory"
   hosts               = local.storage_hosts
   inventory_path      = local.storage_inventory_path
   name_mount_path_map = local.fileshare_name_mount_path_map
-  depends_on          = [ time_sleep.wait_60_seconds ]
+  depends_on          = [ module.write_storage_cluster_inventory ]
 }
 
 module "compute_playbook" {
+  count            = var.enable_deployer == false ? 1 : 0
   source           = "./modules/playbook"
   bastion_fip      = local.bastion_fip
   private_key_path = local.compute_private_key_path
   inventory_path   = local.compute_inventory_path
   playbook_path    = local.compute_playbook_path
+  enable_bastion   = var.enable_bastion
   depends_on       = [ module.compute_inventory ]
 }
 
-module "storage_playbook" {
-  source           = "./modules/playbook"
-  bastion_fip      = local.bastion_fip
-  private_key_path = local.storage_private_key_path
-  inventory_path   = local.storage_inventory_path
-  playbook_path    = local.storage_playbook_path
-  depends_on       = [ module.storage_inventory ]
-}
+# module "storage_playbook" {
+#   count            = var.enable_deployer == false ? 1 : 0
+#   source           = "./modules/playbook"
+#   bastion_fip      = local.bastion_fip
+#   private_key_path = local.storage_private_key_path
+#   inventory_path   = local.storage_inventory_path
+#   playbook_path    = local.storage_playbook_path
+#   enable_bastion   = var.enable_bastion
+#   depends_on       = [ module.storage_inventory ]
+# }
 
 ###################################################
 # Observability Modules
@@ -172,8 +340,9 @@ module "storage_playbook" {
 
 module "cloud_monitoring_instance_creation" {
   source                         = "./modules/observability_instance"
+  enable_deployer                = var.enable_deployer
   location                       = local.region
-  rg                             = local.resource_group_id
+  rg                             = local.resource_group_ids["service_rg"]
   cloud_monitoring_provision     = var.observability_monitoring_enable
   observability_monitoring_plan  = var.observability_monitoring_plan
   enable_metrics_routing         = var.observability_enable_metrics_routing
@@ -191,10 +360,10 @@ module "cloud_monitoring_instance_creation" {
 
 # Code for SCC Instance
 module "scc_instance_and_profile" {
-  count                   = var.scc_enable ? 1 : 0
+  count                   = var.enable_deployer == true && var.scc_enable ? 1 : 0
   source                  = "./modules/security/scc"
   location                = var.scc_location != "" ? var.scc_location : "us-south"
-  rg                      = local.resource_group_id
+  rg                      = local.resource_group_ids["service_rg"]
   scc_profile             = var.scc_enable ? var.scc_profile : ""
   # scc_profile_version     = var.scc_profile != "" && var.scc_profile != null ? var.scc_profile_version : ""
   event_notification_plan = var.scc_event_notification_plan
diff --git a/modules/ansible-roles/roles/host-entry/tasks/main.yml b/modules/ansible-roles/roles/host-entry/tasks/main.yml
deleted file mode 100644
index e69de29b..00000000
diff --git a/modules/ansible-roles/roles/lsf/tasks/lsf_inventory.yml b/modules/ansible-roles/roles/lsf/tasks/lsf_inventory.yml
new file mode 100644
index 00000000..4487194a
--- /dev/null
+++ b/modules/ansible-roles/roles/lsf/tasks/lsf_inventory.yml
@@ -0,0 +1,34 @@
+---
+
+# tasks file for lsf_templates
+
+- name: Create inventory file from template
+  template:
+    src: lsf-inventory.j2
+    dest: "{{ inventory_path }}/lsf-inventory"
+  # delegate_to: localhost
+  delegate_to: "{{ lsf_deployer_hostname }}.comp.com"
+
+- name: Create config file from template
+  template:
+    src: lsf-config.j2
+    dest: "{{ inventory_path }}/lsf-config.yml"
+  # delegate_to: localhost
+  delegate_to: "{{ lsf_deployer_hostname }}.comp.com"
+
+# Update deployer_hostname in group_vars/all
+  
+- name: Update deployer_hostname in group_vars/all
+  ansible.builtin.lineinfile:
+    path: "{{ inventory_path }}/group_vars/all"
+    regexp: '^deployer_hostname: .*'
+    line: 'deployer_hostname: {{ lsf_deployer_hostname }}'
+    # backup: yes
+  delegate_to: "{{ lsf_deployer_hostname }}.comp.com"
+
+# - name: Create all variable file from template
+#   template:
+#     src: lsf-all.j2
+#     dest: "{{ inventory_path }}/group_vars/all"
+#   # delegate_to: localhost
+#   delegate_to: "{{ lsf_deployer_hostname }}.comp.com"
\ No newline at end of file
diff --git a/modules/ansible-roles/roles/lsf/tasks/lsf_prepare.yml b/modules/ansible-roles/roles/lsf/tasks/lsf_prepare.yml
new file mode 100644
index 00000000..9117877f
--- /dev/null
+++ b/modules/ansible-roles/roles/lsf/tasks/lsf_prepare.yml
@@ -0,0 +1,37 @@
+---
+
+# Restart the NetworkManager on deployer node
+
+- name: Restart NetworkManager
+  ansible.builtin.systemd:
+    name: NetworkManager
+    state: restarted
+    enabled: yes
+  delegate_to: "{{ lsf_deployer_hostname }}.comp.com"
+
+# Installing required prerequisite packages for the LSF cluster creation.
+
+- name: LSF | Check OS version for package installation
+  ansible.builtin.shell: "grep -oE 'release [0-9]+' /etc/redhat-release | awk '{print $2}'"
+  register: rhel_version
+  changed_when: false
+
+- name: LSF | Install Required Packages
+  ansible.builtin.dnf:
+    name:
+      - lsof
+      - ipmitool
+    state: present
+  when: rhel_version.stdout in ["8", "9"]
+
+# Create the shared lsf directory
+
+- name: Display the last directory
+  debug:
+    msg: "The last directory is: {{ lsf_dir }}"
+
+- name: Create base directories for lsf configuration
+  file:
+    path: "/mnt/lsf/{{ lsf_dir }}"
+    state: directory
+    mode: '0777'
\ No newline at end of file
diff --git a/modules/ansible-roles/roles/lsf/tasks/main.yml b/modules/ansible-roles/roles/lsf/tasks/main.yml
new file mode 100644
index 00000000..7d712769
--- /dev/null
+++ b/modules/ansible-roles/roles/lsf/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+
+# install required prerequisite packages for the LSF cluster creation.
+- import_tasks: lsf_prepare.yml
+
+# tasks file for template tasks
+- import_tasks: lsf_inventory.yml
\ No newline at end of file
diff --git a/modules/ansible-roles/roles/lsf/templates/lsf-all.j2 b/modules/ansible-roles/roles/lsf/templates/lsf-all.j2
new file mode 100644
index 00000000..14c581a9
--- /dev/null
+++ b/modules/ansible-roles/roles/lsf/templates/lsf-all.j2
@@ -0,0 +1,141 @@
+deployer_hostname: {{ lsf_deployer_hostname }}
+
+PRODUCT_BRAND_NAME: IBM Spectrum
+PRODUCT_HELP_URL: 'https://www.ibm.com/support/knowledgecenter/SSZUDP_10.2.0/suite_welcome/lsf_suite_hpc_welcome.html'
+LSF_SUITE_EDITION: LSF Suite for HPC
+LSF_SUITE_VERSION: 10.2.0.14
+
+# The NFS installation can install the LSF_Masters on the local disks
+# of the machines, except for work and conf directories which will be
+# on NFS.  Set this to:  true  to install the LSF rpms on the LSF_Masters.
+# This allows independent upgrading of a LSF master candidates.
+# Default: false
+LSF_MASTERS_ON_LOCAL:  false
+
+# The JDBC driver jar file to use to connect to
+# the data base
+JDBC_Driver: /usr/share/java/mysql-connector-java.jar
+
+CLEANUP_FILES: true
+# The max number of backup files per configuration file change
+MAX_CONF_BACKUP_FILES: 2
+# Enable floating clients
+ENABLE_FLOATING_CLIENTS: false
+# Enable static clients
+ENABLE_STATIC_CLIENTS: true
+
+PACKAGES:
+  GUI: 
+    es: [ ]
+    kibana: [ ]
+    gpfsio: [ ]
+    beats: [ filebeat-for-lsf, metricbeat-for-lsf, lsf-beat ]
+    execbeat: [ execbeat-for-lsf ]
+    pm: [ lsf-pm-server ]
+    framework: [ lsf-perf, lsf-gui ]
+    explorer: [ lsf-monitor, lsf-explorer-server ]
+    pac: [ lsf-appcenter ]
+  LSF_Master:
+    base: [ lsf-ego-master, lsf-master, lsf-ls-server, lsf-release, lsf-resource-connector ]
+    dm: [ lsf-data-mgr ]
+  LSF_Server: 
+    base: [ lsf-ego-server, lsf-server, lsf-integrations, lsf-devel, lsf-man-pages ]
+    smpi: []
+    smpi_misc: []
+    pmpi: []
+    nfs: [ lsf-nfs-support ]
+  LSF_Client: 
+    base: [ lsf-conf, lsf-client, lsf-ls-client ]
+    pm: [ lsf-pm-client ]
+    dm: [ lsf-data-mgr ]
+  Ubuntu_support: [ lsf-ubuntu-support ]
+  DB:
+    current: [ MariaDB-server, MariaDB-client ]
+    previous: [ mariadb-server, mariadb ]
+
+# NOTE:  The packages to remove are not the same as what you need to 
+#        install, because they are dependencies of what was installed
+UNPACKAGES:
+  GUI: 
+    explorer: [ lsf-monitor, lsf-explorer-server ]
+    pac: [ lsf-appcenter ]
+    base: [ lsf-perf, lsf-gui, logstash-for-lsf, elasticsearch-for-lsf, lsf-gui ,lsf-pm-server ,lsf-pm-client ]
+    kibana: [ kibana-for-lsf ]
+    elk: [ elasticsearch-for-lsf, logstash-for-lsf, kibana-for-lsf ]
+    beats: [ filebeat-for-lsf, metricbeat-for-lsf, lsf-beat, gpfsio-collector-for-lsf, execbeat-for-lsf ]
+    jre: [ ibm-jre ]
+  LSF_Master: [ lsf-ego-master, lsf-master, lsf-ls-client, lsf-ls-server, lsf-release, lsf-resource-connector ,lsf-data-mgr ]
+  LSF_Server:
+    base: [ lsf-conf, lsf-ego-server, lsf-server, lsf-integrations, lsf-devel, lsf-man-pages ,ibm_smpi_lic_s, ibm_smpi ,lsf-pmpi-hpc, lsf-nfs-support ]
+    smpi_misc: [ ibm_smpi-devel, ibm_smpi_gpusupport, ibm_smpi-libgpump, ibm_smpi-pami_devel, ibm_spindle, ibm_smpi_mpipsupport ]
+  LSF_Client: 
+    base: [ lsf-ls-client, lsf-man-pages ]
+    pm: [ lsf-pm-client ]
+    dm: [ lsf-data-mgr ]
+    conf: [ lsf-conf ]
+  DB: [ MariaDB-server, MariaDB-client, MariaDB-libs, MariaDB-common, MariaDB-shared, mariadb-server, mariadb ]
+  Ubuntu_support: [ lsf-ubuntu-support ]
+
+LSF_REPO_DIR: /var/www/html/lsf_suite_pkgs
+LSF_REPO_DIR_SLES: /srv/www/htdocs/lsf_suite_pkgs
+LSF_INSTALLER_DIR: /opt/ibm/lsf_installer
+LSF_SUITE_TOP: {{ LSF_SUITE_TOP }}
+LSF_TOP: "{{ LSF_SUITE_TOP }}/{{ LSF_TOP_FOLDER }}"
+LSF_CONF_DIR: "{{ LSF_SUITE_TOP }}/{{ LSF_TOP_FOLDER }}/conf"
+LSF_WORK_DIR: "{{ LSF_SUITE_TOP }}/{{ LSF_TOP_FOLDER }}/work"
+LSF_LOG_DIR: /opt/ibm/lsflogs
+
+LSF_SWIDTAG: "{{ LSF_SUITE_TOP }}/properties/version/"
+
+# EXT
+EXT_TOP: {{ EXT_TOP }}
+# Process Manager
+PM_TOP: "{{ EXT_TOP }}/{{ PM_TOP_FOLDER }}"
+PM_CONF_DIR: "{{ EXT_TOP }}/{{ PM_TOP_FOLDER }}/conf"
+PM_WORK_DIR: "{{ EXT_TOP }}/{{ PM_TOP_FOLDER }}/work"
+
+# PERF
+PERF_TOP: "{{ EXT_TOP }}/{{ PERF_TOP_FOLDER }}"
+PERF_CONF_DIR: "{{ EXT_TOP }}/{{ PERF_TOP_FOLDER }}/conf"
+PERF_WORK_DIR: "{{ EXT_TOP }}/{{ PERF_TOP_FOLDER }}/work"
+# GUI
+GUI_TOP: "{{ EXT_TOP }}/{{ GUI_TOP_FOLDER }}"
+GUI_CONF_DIR: "{{ EXT_TOP }}/{{ GUI_TOP_FOLDER }}/conf"
+GUI_WORK_DIR: "{{ EXT_TOP }}/{{ GUI_TOP_FOLDER }}/work"
+# Elasticsearch 
+ELK_TOP: {{ ELK_TOP }}
+ES_TOP: "{{ ELK_TOP }}/elasticsearch"
+# Logstash
+LOGSTASH_TOP: "{{ ELK_TOP }}/logstash"
+# Kibana
+KIBANA_TOP: "{{ ELK_TOP }}/kibana"
+# Filebeat
+FILE_BEAT_TOP: "{{ ELK_TOP }}/filebeat"
+# Metricbeat
+METRIC_BEAT_TOP: "{{ ELK_TOP }}/metricbeat"
+# Lsfbeat
+LSF_BEAT_TOP: "{{ ELK_TOP }}/lsfbeat"
+# GPFSIO
+GPFSIO_TOP: "{{ ELK_TOP }}/gpfsio"
+# execbeat
+EXEC_BEAT_TOP: "{{ ELK_TOP }}/execbeat"
+
+# Explorer
+EXPLORER_TOP: "{{ EXT_TOP }}/{{ EXPLORER_TOP_FOLDER }}"
+EXPLORER_CONF_DIR: "{{ EXT_TOP }}/{{ EXPLORER_TOP_FOLDER }}/server/config"
+
+# MPI
+SMPI_TOP: /opt/ibm/spectrum_mpi
+
+# MariaDB
+mariadb_version: 10.0
+# profile directory path
+etc_profile_d: "/etc/profile.d"
+
+# entitlement files
+lsf_entitlement_file : [ lsf.entitlement ]
+ls_entitlement_file : [  ]
+
+# swidtag files
+lsf_master_swidtag_file : [ ibm.com_IBM_Spectrum_LSF_Suite_for_HPC-10.2.0.swidtag ]
+lsf_server_swidtag_file : ibm.com_IBM_Spectrum_LSF_Suite_Servers_Capacity-10.2.0.swidtag
\ No newline at end of file
diff --git a/modules/ansible-roles/roles/lsf/templates/lsf-config.j2 b/modules/ansible-roles/roles/lsf/templates/lsf-config.j2
new file mode 100644
index 00000000..1aee163c
--- /dev/null
+++ b/modules/ansible-roles/roles/lsf/templates/lsf-config.j2
@@ -0,0 +1,162 @@
+---
+#-----------------------------------
+# Copyright IBM Corp. 1992, 2017. All rights reserved.
+# US Government Users Restricted Rights - Use, duplication or disclosure
+# restricted by GSA ADP Schedule Contract with IBM Corp.
+#-----------------------------------
+
+LSF:
+  # Set my_cluster_name to the name of the cluster.
+  my_cluster_name: {{ my_cluster_name }}
+
+  # Enable_Monitoring controls whether
+  # system monitoring functions are turned on.
+  # Set to False to disable monitoring or True
+  # to enable monitoring.
+  Enable_Monitoring: {{ Enable_Monitoring }}
+
+  # HA_shared_dir is the shared directory for High-Availability (HA).
+  # If set to a directory, the installation copies
+  # the configuration files and work directory
+  # contents to the specified directory, and updates the configuration
+  # to point to it.
+  # Set to "none" if an HA shared directory is not used,
+  # or if you use an NFS shared directory defined with
+  # NFS_install_dir below.
+  # HA_shared_dir: /shared/directory/path
+  HA_shared_dir: {{ HA_shared_dir }}
+
+  # NFS_install_dir is a shared directory that contains
+  # the LSF master, server and client binary files, man pages,
+  # and configuration files. When defined, the directory
+  # is also used for HA, so HA_shared_dir above
+  # should be set to "none".
+  # NFS_install_dir: /nfs-or-gpfs-directory
+  # Optionally the LSF_Masters may be installed locally, \
+  # to permit upgrading of LSF Masters independently \
+  # of the rest of the cluster.  This is controlled \
+  # by the LSF_MASTERS_ON_LOCAL parameter in: \
+  #      /opt/ibm/lsf_installer/playbook/group_vars/all 
+  NFS_install_dir: {{ NFS_install_dir }}
+
+  # JDBC_string is the connection string for the
+  # optional external database. If a host has
+  # been given the role of "database" in the
+  # lsf-inventory file, the specified value is set
+  # automatically. If you do not specify a host in the DB_Host role
+  # in the lsf-inventory file, you must define a JDBC_string.
+  # The external database must be created 
+  # by sourcing the database schema files:
+  #   - Copy the /opt/ibm/lsf_installer/DBschema/MySQL/*.sql files on the deployer machine to the remote database host
+  #   - Create a database that is named pac
+  #   - Create a database user who is named pacuser 
+  #   - Grant this user all privileges on the pac database
+  #   - Run the schema files for the database
+  # For more information, see 
+  # "https://www.ibm.com/support/knowledgecenter/SSZRJV_10.2.0/install_guide/pac_install_config.html".
+  # Set the following environment variables on the deployer machine:
+  #   - JDBC_USER
+  #   - JDBC_PASSWORD
+  #
+  #JDBC_string: jdbc:mariadb://<host>[:<port>]/<databaseName>?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT
+  #
+  JDBC_string: none
+
+  # (Optional) Primary_LSF_ADMIN is a primary LSF administrator.
+  #
+  # The primary LSF administrator account must exist
+  # on all hosts in the cluster before you install LSF.
+  #
+  # Note that the primary LSF administrator is lsfadmin by default.
+  # if the lsfadmin user does not exist, the installation creates lsfadmin
+  # with UID 495. The primary administrator owns the LSF configuration files
+  # and log files for job events.
+  #
+  #Primary_LSF_ADMIN: user_name
+
+  # (Optional) Secondary_LSF_ADMINS is a space delimited
+  # list of secondary LSF administrators.
+  #
+  # LSF administrators have permission to reconfigure LSF
+  # and to control batch jobs that are submitted by other users.
+  # Secondary administrators typically do not have permission to start LSF
+  # daemons. Usually, only root has permission to start LSF daemons.
+  #
+  # All secondary LSF administrator accounts must exist
+  # on all hosts in the cluster before you install LSF.
+  #
+  #Secondary_LSF_ADMINS: user_name1 user_name2 ...
+
+  # (Optional) LSF_Ports is a space delimited
+  # list of LSF port numbers.
+  #
+  # LSF has the following default port number values listed below.
+  # All are used for TCP, except LSF_LIM_PORT which also uses UDP.
+  #LSF_LIM_PORT: 7869 
+  #LSF_RES_PORT: 6878 
+  #LSB_SBD_PORT: 6882 
+  #LSB_MBD_PORT: 6881 
+  #LSB_QUERY_PORT: 6891 
+  #LSF_DATA_PORT: 9998
+  #EGO_KD_PORT: 7870 
+  #EGO_PEM_PORT: 7871 
+  #ESC_PORT: 7872 
+  #
+  # Specify either nine individual port numbers or
+  # a range with the starting port number followed by '-'.
+  # A port number must be an integer in the range 1024 - 65535
+  # except for any of the following:
+  # 1966, 1967, 1968, 5000, 6080, 8046, 8047, 8048, 8080, 8081, 8443, 8444.
+  # For example,
+  # LSF_Ports: 9991 9992 9993 9994 9995 9996 9997 9998 9999
+  # LSF_Ports: 9991 -
+  # where '-' indicates eight consecutive numbers from the leading number
+  #
+  #LSF_Ports: port_number1 [ - | port_number2 ... port_number9 ]
+
+  # (Optional) Private_IPv4_Range allows you to specify a range of private IPv4
+  # addresses used by LSF hosts.
+  # This parameter can be used in scenarios where the LSF master host has both 
+  # public and private IP addresses, but the compute nodes have only private IP
+  # addresses. 
+  # Specify a range of IPv4 addresses in the form of a Classless Inter-Domain 
+  # Routing (CIDR) block. 
+  # For example, Private_IPv4_Range: 10.10.99.0/8
+  #Private_IPv4_Range: none
+
+  # The ES_SERVERS parameter sets the list of the Elasticsearch servers where
+  # Elasticsearch 7.2, or later, is running.
+  #
+  # It contains the URLs to which Elasticsearch is listening and enables
+  # LSF Explorer to use the Elasticsearch features.
+  #
+  # Enter a space-separated list of the Elasticserch server URLs in the following format:
+  #        http:// or https:// IP_address or host_name : port number
+  # For example,
+  # ES_SERVERS: "http://hostA:9200 http://hostB:9200"
+  #
+  # If the first server does not respond, the next server in the list is contacted.
+  #
+  #ES_SERVERS: "http://ES_host_ip:9200"
+
+  # ES_SSL_CERTIFICATE_PATH must be configured when
+  # the protocol Elasticsearch (scheme of the URL) is https.
+  # The file path must be accessible on the deployer machine.
+  # For example,
+  #ES_SSL_CERTIFICATE_PATH: /path/to/cert_file.crt
+
+  # LOGSTASH_TOP is the top directory of the Logstash installation.
+  # Use this parameter to enable the energy accounting and the gpfsio-collector service.
+  # When LOGSTASH_TOP is defined, ES_SERVERS must also be defined in lsf-config.yml.
+  #
+  # The directory path must point to the top directory of Logstash on a host in the GUI_Hosts role.
+  # For example, LOGSTASH_TOP: /path/to/logstash/top/directory
+  # 
+  # If the Logstash path.settings is not set to LOGSTASH_TOP/config,
+  # make a symbolic link for LOGSTASH_TOP/config to the Logstash path.settings directory.
+  # For example,
+  # ln -s /etc/logstash LOGSTASH_TOP/config
+  #
+  #LOGSTASH_TOP: none
+  
+# END OF LSF-CONFIG.YML
\ No newline at end of file
diff --git a/modules/ansible-roles/roles/lsf/templates/lsf-inventory.j2 b/modules/ansible-roles/roles/lsf/templates/lsf-inventory.j2
new file mode 100644
index 00000000..51039957
--- /dev/null
+++ b/modules/ansible-roles/roles/lsf/templates/lsf-inventory.j2
@@ -0,0 +1,56 @@
+# LSF Suites Inventory file
+[local]
+localhost
+# Use this file to define the machines there roles
+# A machine can belong to more than one role, but
+# should only belong to one LSF_xxxxx role.
+
+# LSF_Masters are the machines LSF will use to run the
+# management processes.  For HA there must be 2 or more,
+# and the shared filesystem must be available.
+[LSF_Masters]
+{% for host in lsf_masters %}
+{{ host }}
+{% endfor %}
+
+# LSF_Servers are machines that LSF will use to run jobs.
+# Expressions can be used to represent a number of
+# machines e.g.
+#    host[1:100]  ==  host1, host2, host3, ... host100
+#    host[a:f]    ==  hosta, hostb, hostc, ... hostf
+[LSF_Servers]
+{% for host in lsf_servers %}
+{{ host }}
+{% endfor %}
+
+# LSF_Clients are machines that cannot run work, but can
+# submit jobs via the CLI, and query the cluster.
+# These are optional.
+[LSF_Clients]
+{% for host in lsf_clients %}
+{{ host }}
+{% endfor %}
+
+# GUI_Hosts are machines that will run the GUI and
+# other supporting services.  A minimum of 1 machine
+# needs to be a GUI host.  If there is no HA_shared_dir
+# then this must be set to the LSF_Masters host.
+# Use public (external) host name if the machine has
+# multiple NICs.  Make sure the machine can be ping-able
+# by using both its public IP address and the host
+# name reported by the hostname command and vice versa.
+[GUI_Hosts]
+{% for host in gui_hosts %}
+{{ host }}
+{% endfor %}
+
+# DB_HOST is optional, and is the machine that hosts the database 
+# used by the Application Center component in LSF Suite.  
+# However, this database is not configured for High Availability (HA). 
+# To enable HA for this database, manually create the database using MariaDB
+# and configure it to be HA-ready, then set the JDBC_string parameter 
+# in the /opt/ibm/lsf_installer/playbook/lsf-config.yml file to specify the database connection.
+[DB_Host]
+{% for host in db_hosts %}
+{{ host }}
+{% endfor %}
\ No newline at end of file
diff --git a/modules/ansible-roles/roles/lsf/vars/main.yml b/modules/ansible-roles/roles/lsf/vars/main.yml
new file mode 100644
index 00000000..1927972f
--- /dev/null
+++ b/modules/ansible-roles/roles/lsf/vars/main.yml
@@ -0,0 +1,6 @@
+---
+
+# Static Variables
+
+inventory_path: "/opt/ibm/lsf_installer/playbook/"
+lsf_dir: "{{ HA_shared_dir | basename }}"
\ No newline at end of file
diff --git a/modules/ansible-roles/roles/prerequisite/tasks/main.yml b/modules/ansible-roles/roles/prerequisite/tasks/main.yml
deleted file mode 100644
index 55479781..00000000
--- a/modules/ansible-roles/roles/prerequisite/tasks/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-# tasks file for fileshare mount
-- import_tasks: vpc-fileshare-mount.yml
\ No newline at end of file
diff --git a/modules/ansible-roles/roles/prerequisite/handlers/main.yml b/modules/ansible-roles/roles/vpc_fileshare_configure/handlers/main.yml
similarity index 100%
rename from modules/ansible-roles/roles/prerequisite/handlers/main.yml
rename to modules/ansible-roles/roles/vpc_fileshare_configure/handlers/main.yml
diff --git a/modules/ansible-roles/roles/vpc_fileshare_configure/tasks/main.yml b/modules/ansible-roles/roles/vpc_fileshare_configure/tasks/main.yml
new file mode 100644
index 00000000..f8f3dbde
--- /dev/null
+++ b/modules/ansible-roles/roles/vpc_fileshare_configure/tasks/main.yml
@@ -0,0 +1,4 @@
+---
+
+# tasks file for fileshare mount
+- import_tasks: vpc_fileshare_configure.yml
\ No newline at end of file
diff --git a/modules/ansible-roles/roles/prerequisite/tasks/vpc-fileshare-mount.yml b/modules/ansible-roles/roles/vpc_fileshare_configure/tasks/vpc_fileshare_configure.yml
similarity index 93%
rename from modules/ansible-roles/roles/prerequisite/tasks/vpc-fileshare-mount.yml
rename to modules/ansible-roles/roles/vpc_fileshare_configure/tasks/vpc_fileshare_configure.yml
index ca1f1638..aa991f49 100644
--- a/modules/ansible-roles/roles/prerequisite/tasks/vpc-fileshare-mount.yml
+++ b/modules/ansible-roles/roles/vpc_fileshare_configure/tasks/vpc_fileshare_configure.yml
@@ -20,6 +20,9 @@
   with_dict: "{{ name_mount_path_map }}"
   notify: Mount NFS
 
+- name: Flush handlers immediately
+  meta: flush_handlers
+
 - name: Verify mounted filesystems
   command: df -h
   register: df_output
diff --git a/modules/deployer/locals.tf b/modules/deployer/locals.tf
index 7c83b9b6..2768edcc 100644
--- a/modules/deployer/locals.tf
+++ b/modules/deployer/locals.tf
@@ -59,8 +59,8 @@ locals {
         port_max = 22
       }
     }],
-    [for cidr in local.bastion_sg_variable_cidr : {
-      name      = format("allow-variable-outbound-%s", index(local.bastion_sg_variable_cidr, cidr) + 1)
+    [for cidr in concat(local.bastion_sg_variable_cidr, ["0.0.0.0/0"]) : {
+      name      = format("allow-variable-outbound-%s", index(concat(local.bastion_sg_variable_cidr, ["0.0.0.0/0"]), cidr) + 1)
       direction = "outbound"
       remote    = cidr
     }]
@@ -73,3 +73,13 @@ locals {
   # Subnets
   bastion_subnets = var.bastion_subnets
 }
+
+locals {
+  vsi_interfaces     = ["eth0", "eth1"]
+  compute_interfaces = local.vsi_interfaces[0]
+  compute_dns_domain = var.dns_domain_names["compute"]
+
+  management_instance_count     = sum(var.management_instances[*]["count"])
+  static_compute_instance_count = sum(var.static_compute_instances[*]["count"])
+  enable_compute    = local.management_instance_count > 0 || local.static_compute_instance_count > 0
+}
\ No newline at end of file
diff --git a/modules/deployer/main.tf b/modules/deployer/main.tf
index 34c2a8d4..48fb77dd 100644
--- a/modules/deployer/main.tf
+++ b/modules/deployer/main.tf
@@ -1,3 +1,9 @@
+module "compute_key" {
+  count            = local.enable_deployer && local.enable_compute ? 1 : 0
+  source           = "./../key"
+  private_key_path = var.enable_bastion ? "${path.root}/../../modules/ansible-roles/compute_id_rsa" : "${path.root}/modules/ansible-roles/compute_id_rsa" #checkov:skip=CKV_SECRET_6
+}
+
 module "ssh_key" {
   count            = local.enable_bastion ? 1 : 0
   source           = "./../key"
diff --git a/modules/deployer/outputs.tf b/modules/deployer/outputs.tf
index 1e288f77..6ecf495c 100644
--- a/modules/deployer/outputs.tf
+++ b/modules/deployer/outputs.tf
@@ -26,3 +26,21 @@ output "deployer_ip" {
   description = "Deployer IP"
   value       = one(module.deployer_vsi[*]["list"][0]["ipv4_address"])
 }
+
+output "bastion_private_key_content" {
+  description = "Bastion private key content"
+  sensitive   = true
+  value       = one(module.ssh_key[*].private_key_content)
+}
+
+output "compute_public_key_content" {
+  description = "Compute public key content"
+  sensitive   = true
+  value       = one(module.compute_key[*].public_key_content)
+}
+
+output "compute_private_key_content" {
+  description = "Compute private key content"
+  sensitive   = true
+  value       = one(module.compute_key[*].private_key_content)
+}
\ No newline at end of file
diff --git a/modules/deployer/template_files.tf b/modules/deployer/template_files.tf
index ecbd67a9..7569a41a 100644
--- a/modules/deployer/template_files.tf
+++ b/modules/deployer/template_files.tf
@@ -8,6 +8,11 @@ data "template_file" "bastion_user_data" {
 data "template_file" "deployer_user_data" {
   template = file("${path.module}/templates/deployer_user_data.tpl")
   vars = {
-    bastion_public_key_content = local.enable_bastion ? module.ssh_key[0].public_key_content : ""
+    bastion_public_key_content  = local.enable_bastion ? module.ssh_key[0].public_key_content : ""
+    compute_dns_domain          = local.enable_bastion ? local.compute_dns_domain : ""
+    compute_interfaces          = local.enable_bastion ? local.compute_interfaces : ""
+    compute_public_key_content  = local.enable_bastion ? module.compute_key[0].public_key_content : ""
+    compute_private_key_content = local.enable_bastion ? module.compute_key[0].private_key_content : ""
+
   }
 }
diff --git a/modules/deployer/templates/deployer_user_data.tpl b/modules/deployer/templates/deployer_user_data.tpl
index a5782268..5648dba2 100644
--- a/modules/deployer/templates/deployer_user_data.tpl
+++ b/modules/deployer/templates/deployer_user_data.tpl
@@ -14,32 +14,41 @@ then
     USER=ubuntu
 fi
 sed -i -e "s/^/no-port-forwarding,no-agent-forwarding,no-X11-forwarding,command=\"echo \'Please login as the user \\\\\"$USER\\\\\" rather than the user \\\\\"root\\\\\".\';echo;sleep 5; exit 142\" /" /root/.ssh/authorized_keys
+echo "DOMAIN=${compute_dns_domain}" >> "/etc/sysconfig/network-scripts/ifcfg-${compute_interfaces}"
+echo "MTU=9000" >> "/etc/sysconfig/network-scripts/ifcfg-${compute_interfaces}"
+chage -I -1 -m 0 -M 99999 -E -1 -W 14 vpcuser
+120
+systemctl restart NetworkManager
 
 # input parameters
 echo "${bastion_public_key_content}" >> /home/$USER/.ssh/authorized_keys
 echo "StrictHostKeyChecking no" >> /home/$USER/.ssh/config
+echo "StrictHostKeyChecking no" >> ~/.ssh/config
+echo "${compute_public_key_content}" >> ~/.ssh/authorized_keys
+echo "${compute_private_key_content}" > ~/.ssh/id_rsa
+chmod 600 ~/.ssh/id_rsa
 
-# setup env
-# TODO: Conditional installation (python3, terraform & ansible)
-if grep -E -q "CentOS|Red Hat" /etc/os-release
-then
-    # TODO: Terraform Repo access
-    #yum install -y yum-utils
-    #yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
-    #if (which terraform); then echo "Terraform exists, skipping the installation"; else (yum install -y terraform
-    if (which python3); then echo "Python3 exists, skipping the installation"; else (yum install -y python38); fi
-    if (which ansible-playbook); then echo "Ansible exists, skipping the installation"; else (yum install -y ansible); fi
-elif grep -q "Ubuntu" /etc/os-release
-then
-    apt update
-    # TODO: Terraform Repo access
-    #apt-get update && sudo apt-get install -y gnupg software-properties-common
-    #wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | tee /usr/share/keyrings/hashicorp-archive-keyring.gpg
-    #gpg --no-default-keyring --keyring /usr/share/keyrings/hashicorp-archive-keyring.gpg --fingerprint
-    apt install software-properties-common
-    apt-add-repository --yes --update ppa:ansible/ansible
-    if (which python3); then echo "Python3 exists, skipping the installation"; else (apt install python38); fi
-    if (which ansible-playbook); then echo "Ansible exists, skipping the installation"; else (apt install ansible); fi
-fi
+# # setup env
+# # TODO: Conditional installation (python3, terraform & ansible)
+# if grep -E -q "CentOS|Red Hat" /etc/os-release
+# then
+#     # TODO: Terraform Repo access
+#     #yum install -y yum-utils
+#     #yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
+#     #if (which terraform); then echo "Terraform exists, skipping the installation"; else (yum install -y terraform
+#     if (which python3); then echo "Python3 exists, skipping the installation"; else (yum install -y python38); fi
+#     if (which ansible-playbook); then echo "Ansible exists, skipping the installation"; else (yum install -y ansible); fi
+# elif grep -q "Ubuntu" /etc/os-release
+# then
+#     apt update
+#     # TODO: Terraform Repo access
+#     #apt-get update && sudo apt-get install -y gnupg software-properties-common
+#     #wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | tee /usr/share/keyrings/hashicorp-archive-keyring.gpg
+#     #gpg --no-default-keyring --keyring /usr/share/keyrings/hashicorp-archive-keyring.gpg --fingerprint
+#     apt install software-properties-common
+#     apt-add-repository --yes --update ppa:ansible/ansible
+#     if (which python3); then echo "Python3 exists, skipping the installation"; else (apt install python38); fi
+#     if (which ansible-playbook); then echo "Ansible exists, skipping the installation"; else (apt install ansible); fi
+# fi
 
 # TODO: run terraform
diff --git a/modules/deployer/variables.tf b/modules/deployer/variables.tf
index 1c9ba1e2..1b89ae38 100644
--- a/modules/deployer/variables.tf
+++ b/modules/deployer/variables.tf
@@ -130,3 +130,34 @@ variable "skip_iam_authorization_policy" {
   default     = false
   description = "Set to false if authorization policy is required for VPC block storage volumes to access kms. This can be set to true if authorization policy already exists. For more information on how to create authorization policy manually, see [creating authorization policies for block storage volume](https://cloud.ibm.com/docs/vpc?topic=vpc-block-s2s-auth&interface=ui)."
 }
+
+variable "management_instances" {
+  type = list(
+    object({
+      profile = string
+      count   = number
+      image   = string
+    })
+  )
+  description = "Number of instances to be launched for management."
+}
+
+variable "static_compute_instances" {
+  type = list(
+    object({
+      profile = string
+      count   = number
+      image   = string
+    })
+  )
+  description = "Total Number of instances to be launched for compute cluster."
+}
+
+variable "dns_domain_names" {
+  type = object({
+    compute  = string
+    storage  = string
+    protocol = string
+  })
+  description = "IBM Cloud HPC DNS domain names."
+}
diff --git a/modules/file_storage/outputs.tf b/modules/file_storage/outputs.tf
index c8c27cc3..7f265e54 100644
--- a/modules/file_storage/outputs.tf
+++ b/modules/file_storage/outputs.tf
@@ -9,4 +9,4 @@ output "mount_path" {
 output "name_mount_path_map" {
   description = "Mount path name and its path map"
   value = { for mount_details in flatten([ibm_is_share_mount_target.share_target_vpc, ibm_is_share_mount_target.share_target_sg]) : split("-", mount_details.name)[length(split("-", mount_details.name)) - 4] => mount_details.mount_path }
-}
+}
\ No newline at end of file
diff --git a/modules/inventory/main.tf b/modules/inventory/main.tf
index 10c6e56e..b63bf85d 100644
--- a/modules/inventory/main.tf
+++ b/modules/inventory/main.tf
@@ -7,7 +7,6 @@ resource "local_sensitive_file" "itself" {
   content  = <<EOT
 [all_nodes]
 ${join("\n", var.hosts)}
-
 [all:vars]
 name_mount_path_map = {${join(",", [for k, v in var.name_mount_path_map : "\"${k}\": \"${v}\""])}}
 EOT
diff --git a/modules/landing_zone/locals.tf b/modules/landing_zone/locals.tf
index 071ad65b..394529e7 100644
--- a/modules/landing_zone/locals.tf
+++ b/modules/landing_zone/locals.tf
@@ -105,7 +105,7 @@ locals {
         name           = "bastion-subnet"
         acl_name       = "hpc-acl"
         cidr           = var.bastion_subnets_cidr[0]
-        public_gateway = false
+        public_gateway = true
       } : null
     ] : []
   }
@@ -120,7 +120,7 @@ locals {
   # If user defined then use existing else create new
   # Calculate network acl rules (can be done inplace in vpcs)
   # TODO: VPN expectation
-  cidrs_network_acl_rules = compact(flatten([local.schematics_reserved_cidrs, var.allowed_cidr, var.network_cidr, "161.26.0.0/16", "166.8.0.0/14"]))
+  cidrs_network_acl_rules = compact(flatten([local.schematics_reserved_cidrs, var.allowed_cidr, var.network_cidr, "161.26.0.0/16", "166.8.0.0/14", "0.0.0.0/0"]))
   network_acl_inbound_rules = [
     for cidr_index in range(length(local.cidrs_network_acl_rules)) : {
       name        = format("allow-inbound-%s", cidr_index + 1)
diff --git a/modules/landing_zone/outputs.tf b/modules/landing_zone/outputs.tf
index e70258b4..f64163dd 100644
--- a/modules/landing_zone/outputs.tf
+++ b/modules/landing_zone/outputs.tf
@@ -106,7 +106,7 @@ output "boot_volume_encryption_key" {
 
 output "key_management_guid" {
   description = "GUID for KMS instance"
-  value       = var.key_management != null ? module.landing_zone[0].key_management_guid : null
+  value       = var.enable_landing_zone ? var.key_management != null ? module.landing_zone[0].key_management_guid : null : null
 }
 
 output "cos_buckets_data" {
diff --git a/modules/landing_zone_vsi/locals.tf b/modules/landing_zone_vsi/locals.tf
index 24d5b8df..ef5d382a 100644
--- a/modules/landing_zone_vsi/locals.tf
+++ b/modules/landing_zone_vsi/locals.tf
@@ -202,11 +202,13 @@ locals {
       remote    = module.client_sg[0].security_group_id
     },
     */
+    /*
     {
       name      = "allow-all-bastion-out"
       direction = "outbound"
       remote    = var.bastion_security_group_id
     },
+    */
     /*
     {
       name      = "allow-all-client-out"
diff --git a/modules/landing_zone_vsi/main.tf b/modules/landing_zone_vsi/main.tf
index f3d89cbf..1239c810 100644
--- a/modules/landing_zone_vsi/main.tf
+++ b/modules/landing_zone_vsi/main.tf
@@ -1,13 +1,20 @@
-module "compute_key" {
-  count            = local.enable_compute ? 1 : 0
-  source           = "./../key"
-  private_key_path = "./../../modules/ansible-roles/compute_id_rsa" #checkov:skip=CKV_SECRET_6
+# module "compute_key" {
+#   count            = local.enable_compute ? 1 : 0
+#   source           = "./../key"
+#   private_key_path = "./../../modules/ansible-roles/compute_id_rsa" #checkov:skip=CKV_SECRET_6
+# }
+
+resource "local_sensitive_file" "write_meta_private_key" {
+  count           = local.enable_compute ? 1 : 0
+  content         = base64decode(var.compute_private_key_content)
+  filename        = var.enable_bastion ? "${path.root}/../../modules/ansible-roles/compute_id_rsa" : "${path.root}/modules/ansible-roles/compute_id_rsa"
+  file_permission = "0600"
 }
 
 module "storage_key" {
   count            = local.enable_storage ? 1 : 0
   source           = "./../key"
-  private_key_path = "./../../modules/ansible-roles/storage_id_rsa" #checkov:skip=CKV_SECRET_6
+  private_key_path = var.enable_bastion ? "${path.root}/../../modules/ansible-roles/storage_id_rsa" : "${path.root}/modules/ansible-roles/storage_id_rsa" #checkov:skip=CKV_SECRET_6
 }
 
 module "client_sg" {
@@ -43,6 +50,17 @@ module "storage_sg" {
   vpc_id                       = var.vpc_id
 }
 
+resource "ibm_is_security_group_rule" "add_comp_sg_bastion" {
+  group     = var.bastion_security_group_id
+  direction = "inbound"
+  remote    = module.compute_sg[0].security_group_id
+}
+
+resource "ibm_is_security_group_rule" "add_comp_sg_comp" {
+  group     = module.compute_sg[0].security_group_id
+  direction = "inbound"
+  remote    = module.compute_sg[0].security_group_id
+}
 
 module "client_vsi" {
   count                         = length(var.client_instances)
diff --git a/modules/landing_zone_vsi/template_files.tf b/modules/landing_zone_vsi/template_files.tf
index c455f6c5..ca7ebab6 100644
--- a/modules/landing_zone_vsi/template_files.tf
+++ b/modules/landing_zone_vsi/template_files.tf
@@ -2,8 +2,8 @@ data "template_file" "client_user_data" {
   template = file("${path.module}/templates/client_user_data.tpl")
   vars = {
     bastion_public_key_content = var.bastion_public_key_content != null ? var.bastion_public_key_content : ""
-    client_public_key_content  = local.enable_client ? module.compute_key[0].public_key_content : ""
-    client_private_key_content = local.enable_client ? module.compute_key[0].private_key_content : ""
+    client_public_key_content  = local.enable_client ? var.compute_public_key_content != null ? var.compute_public_key_content : "" : ""
+    client_private_key_content = local.enable_client ? var.compute_private_key_content != null ? var.compute_private_key_content : "" : ""
     client_interfaces          = var.storage_type == "scratch" ? local.vsi_interfaces[0] : local.bms_interfaces[0]
     client_dns_domain          = var.dns_domain_names["compute"]
   }
@@ -13,8 +13,8 @@ data "template_file" "management_user_data" {
   template = file("${path.module}/templates/management_user_data.tpl")
   vars = {
     bastion_public_key_content     = var.bastion_public_key_content != null ? var.bastion_public_key_content : ""
-    management_public_key_content  = local.enable_management ? module.compute_key[0].public_key_content : ""
-    management_private_key_content = local.enable_management ? module.compute_key[0].private_key_content : ""
+    management_public_key_content  = local.enable_management ? var.compute_public_key_content != null ? var.compute_public_key_content : "" : ""
+    management_private_key_content = local.enable_management ? var.compute_private_key_content != null ? var.compute_private_key_content : "" : ""
     management_interfaces          = var.storage_type == "scratch" ? local.vsi_interfaces[0] : local.bms_interfaces[0]
     management_dns_domain          = var.dns_domain_names["compute"]
   }
@@ -24,8 +24,8 @@ data "template_file" "compute_user_data" {
   template = file("${path.module}/templates/compute_user_data.tpl")
   vars = {
     bastion_public_key_content  = var.bastion_public_key_content != null ? var.bastion_public_key_content : ""
-    compute_public_key_content  = local.enable_compute ? module.compute_key[0].public_key_content : ""
-    compute_private_key_content = local.enable_compute ? module.compute_key[0].private_key_content : ""
+    compute_public_key_content  = local.enable_compute ? var.compute_public_key_content != null ? var.compute_public_key_content : "" : ""
+    compute_private_key_content = local.enable_compute ? var.compute_private_key_content != null ? var.compute_private_key_content : "" : ""
     compute_interfaces          = var.storage_type == "scratch" ? local.vsi_interfaces[0] : local.bms_interfaces[0]
     compute_dns_domain          = var.dns_domain_names["compute"]
     # TODO: Fix me
diff --git a/modules/landing_zone_vsi/templates/compute_user_data.tpl b/modules/landing_zone_vsi/templates/compute_user_data.tpl
index 2fc14b81..2fdb9bb0 100644
--- a/modules/landing_zone_vsi/templates/compute_user_data.tpl
+++ b/modules/landing_zone_vsi/templates/compute_user_data.tpl
@@ -17,9 +17,9 @@ sed -i -e "s/^/no-port-forwarding,no-agent-forwarding,no-X11-forwarding,command=
 
 # input parameters
 echo "${bastion_public_key_content}" >> ~/.ssh/authorized_keys
-echo "${compute_public_key_content}" >> ~/.ssh/authorized_keys
+echo "${compute_public_key_content}" | base64 --decode >> ~/.ssh/authorized_keys
 echo "StrictHostKeyChecking no" >> ~/.ssh/config
-echo "${compute_private_key_content}" > ~/.ssh/id_rsa
+echo "${compute_private_key_content}" | base64 --decode > ~/.ssh/id_rsa
 chmod 600 ~/.ssh/id_rsa
 
 # network setup
diff --git a/modules/landing_zone_vsi/templates/management_user_data.tpl b/modules/landing_zone_vsi/templates/management_user_data.tpl
index 8488c692..1db5be80 100644
--- a/modules/landing_zone_vsi/templates/management_user_data.tpl
+++ b/modules/landing_zone_vsi/templates/management_user_data.tpl
@@ -17,9 +17,9 @@ sed -i -e "s/^/no-port-forwarding,no-agent-forwarding,no-X11-forwarding,command=
 
 # input parameters
 echo "${bastion_public_key_content}" >> ~/.ssh/authorized_keys
-echo "${management_public_key_content}" >> ~/.ssh/authorized_keys
+echo "${management_public_key_content}" | base64 --decode >> ~/.ssh/authorized_keys
 echo "StrictHostKeyChecking no" >> ~/.ssh/config
-echo "${management_private_key_content}" > ~/.ssh/id_rsa
+echo "${management_private_key_content}" | base64 --decode > ~/.ssh/id_rsa
 chmod 600 ~/.ssh/id_rsa
 
 # network setup
diff --git a/modules/landing_zone_vsi/variables.tf b/modules/landing_zone_vsi/variables.tf
index 5339eb2e..bb965cb1 100644
--- a/modules/landing_zone_vsi/variables.tf
+++ b/modules/landing_zone_vsi/variables.tf
@@ -298,3 +298,23 @@ variable "boot_volume_encryption_key" {
 ##############################################################################
 # TODO: Auth Server (LDAP/AD) Variables
 ##############################################################################
+
+variable "compute_public_key_content" {
+  type        = string
+  sensitive   = true
+  default     = null
+  description = "Compute security key content."
+}
+
+variable "compute_private_key_content" {
+  type        = string
+  sensitive   = true
+  default     = null
+  description = "Compute security key content."
+}
+
+variable "enable_bastion" {
+  type        = bool
+  default     = true
+  description = "The solution supports multiple ways to connect to your HPC cluster for example, using bastion node, via VPN or direct connection. If connecting to the HPC cluster via VPN or direct connection, set this value to false."
+}
\ No newline at end of file
diff --git a/modules/observability_instance/datasources.tf b/modules/observability_instance/datasources.tf
index 6be8d171..241a7090 100644
--- a/modules/observability_instance/datasources.tf
+++ b/modules/observability_instance/datasources.tf
@@ -8,6 +8,6 @@ data "http" "sysdig_prws_key" {
   request_headers = {
     Accept        = "application/json"
     Authorization = data.ibm_iam_auth_token.tokendata.iam_access_token
-    IBMInstanceID = var.cloud_monitoring_provision ? module.observability_instance.cloud_monitoring_guid : ""
+    IBMInstanceID = var.enable_deployer && var.cloud_monitoring_provision ? module.observability_instance.cloud_monitoring_guid : ""
   }
 }
diff --git a/modules/observability_instance/main.tf b/modules/observability_instance/main.tf
index 43568f7e..586260a5 100644
--- a/modules/observability_instance/main.tf
+++ b/modules/observability_instance/main.tf
@@ -5,6 +5,7 @@ locals {
 }
 
 module "observability_instance" {
+  count = var.enable_deployer ? 1 : 0 
   # Replace "master" with a GIT release version to lock into a specific release
   source            = "terraform-ibm-modules/observability-instances/ibm"
   version           = "3.3.1"
diff --git a/modules/observability_instance/outputs.tf b/modules/observability_instance/outputs.tf
index 523a668e..43c89b4e 100644
--- a/modules/observability_instance/outputs.tf
+++ b/modules/observability_instance/outputs.tf
@@ -1,5 +1,5 @@
 output "cloud_monitoring_access_key" {
-  value       = var.cloud_monitoring_provision ? module.observability_instance.cloud_monitoring_access_key : null
+  value       = var.enable_deployer && var.cloud_monitoring_provision ? module.observability_instance.cloud_monitoring_access_key : null
   description = "IBM Cloud Monitoring access key for agents to use"
   sensitive   = true
 }
@@ -10,7 +10,7 @@ output "cloud_monitoring_ingestion_url" {
 }
 
 output "cloud_monitoring_prws_key" {
-  value       = var.cloud_monitoring_provision ? jsondecode(data.http.sysdig_prws_key[0].response_body).token.key : null
+  value       = var.enable_deployer && var.cloud_monitoring_provision ? jsondecode(data.http.sysdig_prws_key[0].response_body).token.key : null
   description = "IBM Cloud Monitoring Prometheus Remote Write ingestion key"
   sensitive   = true
 }
@@ -31,7 +31,7 @@ output "cloud_logs_ingress_private_endpoint" {
 }
 
 output "cloud_monitoring_url" {
-  value       = var.cloud_monitoring_provision ? "https://cloud.ibm.com/observe/embedded-view/monitoring/${module.observability_instance.cloud_monitoring_guid}" : null
+  value       = var.enable_deployer && var.cloud_monitoring_provision ? "https://cloud.ibm.com/observe/embedded-view/monitoring/${module.observability_instance.cloud_monitoring_guid}" : null
   description = "IBM Cloud Monitoring URL"
 }
 
diff --git a/modules/observability_instance/variables.tf b/modules/observability_instance/variables.tf
index 25522547..2a80cbbf 100644
--- a/modules/observability_instance/variables.tf
+++ b/modules/observability_instance/variables.tf
@@ -85,3 +85,9 @@ variable "cloud_metrics_data_bucket" {
   description = "Generate and store metrics from your events so you can visualize, track, and alert on log events in real-time."
   type        = any
 }
+
+variable "enable_deployer" {
+  type        = bool
+  default     = false
+  description = "Deployer should be only used for better deployment performance"
+}
\ No newline at end of file
diff --git a/modules/playbook/main.tf b/modules/playbook/main.tf
index 857e4d44..38c8bd68 100644
--- a/modules/playbook/main.tf
+++ b/modules/playbook/main.tf
@@ -1,15 +1,19 @@
+locals {
+  proxyjump = var.enable_bastion ? "-o ProxyJump=ubuntu@${var.bastion_fip}" : ""
+}
+
 resource "local_file" "create_playbook" {
   count    = var.inventory_path != null ? 1 : 0
   content  = <<EOT
 # Ensure provisioned VMs are up and Passwordless SSH setup has been established
 
-- name: Connect to remote hosts via bastion and perform tasks
+- name: Check passwordless SSH connection is setup
   hosts: [all_nodes]
   any_errors_fatal: true
   gather_facts: false
   vars:
     ansible_ssh_common_args: >
-      -o ProxyJump=ubuntu@${var.bastion_fip}
+      ${local.proxyjump}
       -o ControlMaster=auto
       -o ControlPersist=30m
       -o UserKnownHostsFile=/dev/null
@@ -30,15 +34,19 @@ resource "local_file" "create_playbook" {
   gather_facts: false
   vars:
     ansible_ssh_common_args: >
-      -o ProxyJump=ubuntu@${var.bastion_fip}
+      ${local.proxyjump}
       -o ControlMaster=auto
       -o ControlPersist=30m
       -o UserKnownHostsFile=/dev/null
       -o StrictHostKeyChecking=no
     ansible_user: root
     ansible_ssh_private_key_file: ${var.private_key_path}
+  pre_tasks:
+    - name: Load cluster-specific variables
+      include_vars: all.json
   roles:
-     - prerequisite
+     - vpc_fileshare_configure
+     - lsf
 EOT
   filename = var.playbook_path
 }
@@ -56,15 +64,21 @@ resource "null_resource" "run_playbook" {
   depends_on = [local_file.create_playbook]
 }
 
-resource "ansible_playbook" "playbook" {
-  playbook   = var.playbook_path
-  name       = "localhost"
-  replayable = true
-  verbosity  = 6
-  extra_vars = {
-    ansible_python_interpreter = "auto"
-    inventory_file = var.inventory_path
+resource "null_resource" "run_lsf_playbooks" {
+  count = var.inventory_path != null ? 1 : 0
+
+  provisioner "local-exec" {
+    interpreter = ["/bin/bash", "-c"]
+    command = <<EOT
+      sudo ansible-playbook -i /opt/ibm/lsf_installer/playbook/lsf-inventory /opt/ibm/lsf_installer/playbook/lsf-config-test.yml &&
+      sudo ansible-playbook -i /opt/ibm/lsf_installer/playbook/lsf-inventory /opt/ibm/lsf_installer/playbook/lsf-predeploy-test.yml &&
+      sudo ansible-playbook -i /opt/ibm/lsf_installer/playbook/lsf-inventory /opt/ibm/lsf_installer/playbook/lsf-deploy.yml
+    EOT
+  }
+
+  triggers = {
+    build = timestamp()
   }
-  depends_on = [local_file.create_playbook]
-}
 
+  depends_on = [null_resource.run_playbook]
+}
\ No newline at end of file
diff --git a/modules/playbook/variables.tf b/modules/playbook/variables.tf
index 72e75409..248b03dd 100644
--- a/modules/playbook/variables.tf
+++ b/modules/playbook/variables.tf
@@ -21,3 +21,9 @@ variable "playbook_path" {
   type        = string
   default     = "ssh.yaml"
 }
+
+variable "enable_bastion" {
+  type        = bool
+  default     = true
+  description = "The solution supports multiple ways to connect to your HPC cluster for example, using bastion node, via VPN or direct connection. If connecting to the HPC cluster via VPN or direct connection, set this value to false."
+}
\ No newline at end of file
diff --git a/modules/write_inventory/main.tf b/modules/write_inventory/main.tf
new file mode 100644
index 00000000..55875618
--- /dev/null
+++ b/modules/write_inventory/main.tf
@@ -0,0 +1,26 @@
+/*
+    Write provisioned infrastructure details to JSON.
+*/
+
+resource "local_sensitive_file" "itself" {
+  content = <<EOT
+{
+  "lsf_masters": ${jsonencode(var.lsf_masters)},
+  "lsf_servers": ${jsonencode(var.lsf_servers)},
+  "lsf_clients": ${jsonencode(var.lsf_clients)},
+  "gui_hosts": ${jsonencode(var.gui_hosts)},
+  "db_hosts": ${jsonencode(var.db_hosts)},
+  "my_cluster_name": ${jsonencode(var.my_cluster_name)},
+  "HA_shared_dir": ${jsonencode(var.ha_shared_dir)},
+  "NFS_install_dir": ${jsonencode(var.nfs_install_dir)},
+  "Enable_Monitoring": ${jsonencode(var.Enable_Monitoring)},
+  "lsf_deployer_hostname": ${jsonencode(var.lsf_deployer_hostname)}
+}
+EOT
+  filename = var.json_inventory_path
+}
+
+output "write_inventory_complete" {
+  value      = true
+  depends_on = [local_sensitive_file.itself]
+}
\ No newline at end of file
diff --git a/modules/ansible-roles/roles/host-entry/tasks/hosts-entry.yml b/modules/write_inventory/outputs.tf
similarity index 100%
rename from modules/ansible-roles/roles/host-entry/tasks/hosts-entry.yml
rename to modules/write_inventory/outputs.tf
diff --git a/modules/write_inventory/variables.tf b/modules/write_inventory/variables.tf
new file mode 100644
index 00000000..6cec960c
--- /dev/null
+++ b/modules/write_inventory/variables.tf
@@ -0,0 +1,65 @@
+variable "json_inventory_path" {
+  type        = string
+  default     = "inventory.json"
+  description = "Json inventory file path"
+}
+
+variable "lsf_masters" {
+  type        = list(string)
+  default     = null
+  description = "list of lsf master nodes"
+}
+
+variable "lsf_servers" {
+  type        = list(string)
+  default     = null
+  description = "list of lsf server nodes"
+}
+
+variable "lsf_clients" {
+  type        = list(string)
+  default     = null
+  description = "list of lsf client nodes"
+}
+
+variable "gui_hosts" {
+  type        = list(string)
+  default     = null
+  description = "list of lsf gui nodes"
+}
+
+variable "db_hosts" {
+  type        = list(string)
+  default     = null
+  description = "list of lsf gui db nodes"
+}
+
+variable "my_cluster_name" {
+  type        = string
+  default     = null
+  description = "Name of lsf cluster"
+}
+
+variable "ha_shared_dir" {
+  type        = string
+  default     = null
+  description = "Path for lsf shared dir"
+}
+
+variable "nfs_install_dir" {
+  type        = string
+  default     = null
+  description = "Private key file path"
+}
+
+variable "Enable_Monitoring" {
+  type        = bool
+  default     = null
+  description = "Option to enable the monitoring"
+}
+
+variable "lsf_deployer_hostname" {
+  type        = string
+  default     = null
+  description = "Deployer host name"
+}
\ No newline at end of file
diff --git a/modules/write_inventory/version.tf b/modules/write_inventory/version.tf
new file mode 100644
index 00000000..83590363
--- /dev/null
+++ b/modules/write_inventory/version.tf
@@ -0,0 +1,22 @@
+##############################################################################
+# Terraform Providers
+##############################################################################
+
+terraform {
+  required_version = ">= 1.3"
+  # Use "greater than or equal to" range for root level modules
+  required_providers {
+    ibm = {
+      source  = "IBM-Cloud/ibm"
+      version = ">= 1.68.1, < 2.0.0"
+    }
+    local = {
+      source  = "hashicorp/local"
+      version = "~> 2"
+    }
+    ansible = {
+      source  = "ansible/ansible"
+      version = "~> 1.3.0"
+    }
+  }
+}
diff --git a/outputs.tf b/outputs.tf
index 06191e9a..1accc0e8 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -29,7 +29,7 @@ output "ssh_to_storage" {
   value       = var.storage_instances[0]["count"] != 0 && var.enable_bastion ? "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -J ubuntu@${module.deployer.bastion_fip} vpcuser@${local.storage_hosts[0]}" : null
 }
 
-output "ssh_to_compute" {
-  description = "SSH command to connect to the compute cluster"
-  value       = (var.management_instances[0]["count"] != 0 || var.static_compute_instances[0]["count"] != 0) && var.enable_bastion ? "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -J ubuntu@${module.deployer.bastion_fip} vpcuser@${local.compute_hosts[0]}" : null
-}
+# output "ssh_to_compute" {
+#   description = "SSH command to connect to the compute cluster"
+#   value       = (var.management_instances[0]["count"] != 0 || var.static_compute_instances[0]["count"] != 0) && var.enable_bastion ? "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -J ubuntu@${module.deployer.bastion_fip} vpcuser@${local.compute_hosts[0]}" : null
+# }
diff --git a/provider.tf b/provider.tf
new file mode 100644
index 00000000..d3958ea4
--- /dev/null
+++ b/provider.tf
@@ -0,0 +1,4 @@
+provider "ibm" {
+  ibmcloud_api_key = var.ibmcloud_api_key
+  region           = local.region
+}
\ No newline at end of file
diff --git a/solutions/lsf/locals.tf b/solutions/lsf/locals.tf
index 2987bbd9..e25da8b4 100644
--- a/solutions/lsf/locals.tf
+++ b/solutions/lsf/locals.tf
@@ -86,6 +86,9 @@ locals {
     skip_flowlogs_s2s_auth_policy                    = var.skip_flowlogs_s2s_auth_policy
     skip_iam_authorization_policy                    = var.skip_iam_authorization_policy
     skip_kms_s2s_auth_policy                         = var.skip_kms_s2s_auth_policy
+
+    # New Variables
+    ibmcloud_api_key                                 = var.ibmcloud_api_key
   }
 }
 
@@ -159,5 +162,7 @@ locals {
     skip_flowlogs_s2s_auth_policy                    = lookup(local.override[local.override_type], "skip_flowlogs_s2s_auth_policy", local.config.skip_flowlogs_s2s_auth_policy)
     skip_iam_authorization_policy                    = lookup(local.override[local.override_type], "skip_iam_authorization_policy", local.config.skip_iam_authorization_policy)
     skip_kms_s2s_auth_policy                         = lookup(local.override[local.override_type], "skip_kms_s2s_auth_policy", local.config.skip_kms_s2s_auth_policy)
+    # New Variables
+    ibmcloud_api_key                                 = lookup(local.override[local.override_type], "ibmcloud_api_key", local.config.ibmcloud_api_key)
   }
 }
diff --git a/solutions/lsf/main.tf b/solutions/lsf/main.tf
index de59f320..99750186 100644
--- a/solutions/lsf/main.tf
+++ b/solutions/lsf/main.tf
@@ -68,4 +68,7 @@ module "lsf" {
   skip_flowlogs_s2s_auth_policy                    = local.env.skip_flowlogs_s2s_auth_policy
   skip_iam_authorization_policy                    = local.env.skip_iam_authorization_policy
   skip_kms_s2s_auth_policy                         = local.env.skip_kms_s2s_auth_policy
+
+  # New Variables
+  ibmcloud_api_key                                 = local.env.ibmcloud_api_key
 }
diff --git a/solutions/lsf/outputs.tf b/solutions/lsf/outputs.tf
index 4889b3e4..aac8ff51 100644
--- a/solutions/lsf/outputs.tf
+++ b/solutions/lsf/outputs.tf
@@ -1,13 +1,13 @@
-# output "lsf" {
-#   value = module.lsf.file_storage
-#   #sensitive = true
-# }
-
-output "ssh_to_compute" {
-  value = module.lsf.ssh_to_compute
+output "lsf" {
+  value = module.lsf.file_storage
   #sensitive = true
 }
 
-output "lsf" {
-  value = module.lsf
-}
\ No newline at end of file
+# output "ssh_to_compute" {
+#   value = module.lsf.ssh_to_compute
+#   #sensitive = true
+# }
+
+# output "lsf" {
+#   value = module.lsf
+# }
\ No newline at end of file
diff --git a/variables.tf b/variables.tf
index ecde0ae7..48e061c4 100644
--- a/variables.tf
+++ b/variables.tf
@@ -392,7 +392,15 @@ variable "file_shares" {
       iops       = number
     })
   )
-  default     = null
+  default = [{
+    mount_path = "/mnt/binaries"
+    size       = 100
+    iops       = 1000
+    }, {
+    mount_path = "/mnt/data"
+    size       = 100
+    iops       = 1000
+  }]
   description = "Custom file shares to access shared storage"
 }
 
@@ -840,3 +848,71 @@ variable "scc_event_notification_plan" {
     error_message = "Provide Event Notification instance plan to be used (accepting 'lite' and 'standard', defaulting to 'lite'). This instance is used in conjuction with S.C.C. one."
   }
 }
+
+variable "enable_landing_zone" {
+  type        = bool
+  default     = true
+  description = "Run landing zone module."
+}
+
+variable "vpc_id" {
+  type        = string
+  default     = null
+  description = "ID of an existing VPC in which the cluster resources will be deployed."
+}
+
+variable "bastion_fip" {
+  type        = string
+  default     = null
+  description = "bastion fip"
+}
+
+variable "compute_public_key_content" {
+  type        = string
+  sensitive   = true
+  default     = null
+  description = "Compute security key content."
+}
+
+variable "compute_private_key_content" {
+  type        = string
+  sensitive   = true
+  default     = null
+  description = "Compute security key content."
+}
+
+variable "enable_atracker" {
+  type        = bool
+  default     = false
+  description = "Enable Activity tracker"
+}
+
+variable "cloud_logs_data_bucket" {
+  type        = list(string)
+  default     = []
+  description = ""
+}
+
+variable "cloud_metrics_data_bucket" {
+  type        = list(string)
+  default     = []
+  description = ""
+}
+
+variable "bastion_security_group_id" {
+  type        = string
+  default     = null
+  description = "bastion security group id"
+}
+
+variable "deployer_hostname" {
+  type        = string
+  default     = null
+  description = "deployer node hostname"
+}
+
+variable "deployer_ip" {
+  type        = string
+  default     = null
+  description = "deployer node ip"
+}
\ No newline at end of file