diff --git a/README.md b/README.md
index e7ec412..d761531 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 PostgreSQL is an open source object-relational database management system. It’s highly extensible, highly scalable, and has many features. PostgreSQL supports data replication across multiple data centers.
 
-This reference architecture shows a typical three-node deployment of a PostgreSQL cluster on Oracle Cloud Infrastructure Compute instances. In this architecture, the servers are configured in master and standby configuration and use streaming replication.
+This reference architecture shows a typical three-node deployment of a PostgreSQL cluster on Oracle Cloud Infrastructure Compute instances. In this architecture, the servers are configured in master and standby configuration and use streaming replication. It will also automatically install postgis34 and pgvector.
 
 For details of the architecture, see [_Deploy a PostgreSQL database_](https://docs.oracle.com/en/solutions/deploy-postgresql-db/index.html)
 
@@ -18,7 +18,7 @@ If you don't have the required permissions and quota, contact your tenancy admin
 
 1. Click [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?region=home&zipUrl=https://github.com/oracle-devrel/terraform-oci-arch-postgresql/releases/latest/download/terraform-oci-arch-postgresql-stack-latest.zip)
 
-    If you aren't already signed in, when prompted, enter the tenancy and user credentials.
+   If you aren't already signed in, when prompted, enter the tenancy and user credentials.
 
 2. Review and accept the terms and conditions.
 
@@ -30,13 +30,14 @@ If you don't have the required permissions and quota, contact your tenancy admin
 
 6. Wait for the job to be completed, and review the plan.
 
-    To make any changes, return to the Stack Details page, click **Edit Stack**, and make the required changes. Then, run the **Plan** action again.
+   To make any changes, return to the Stack Details page, click **Edit Stack**, and make the required changes. Then, run the **Plan** action again.
 
-7. If no further changes are necessary, return to the Stack Details page, click **Terraform Actions**, and select **Apply**. 
+7. If no further changes are necessary, return to the Stack Details page, click **Terraform Actions**, and select **Apply**.
 
 ## Deploy Using the Terraform CLI
 
 ### Clone the Repository
+
 Now, you'll want a local copy of this repo. You can make that with the commands:
 
     git clone https://github.com/oracle-devrel/terraform-oci-arch-postgresql
@@ -44,7 +45,8 @@ Now, you'll want a local copy of this repo. You can make that with the commands:
     ls
 
 ### Prerequisites
-First off, you'll need to do some pre-deploy setup.  That's all detailed [here](https://github.com/cloud-partners/oci-prerequisites).
+
+First off, you'll need to do some pre-deploy setup. That's all detailed [here](https://github.com/cloud-partners/oci-prerequisites).
 
 Secondly, create a `terraform.tfvars` file and populate with the following information:
 
@@ -58,31 +60,60 @@ private_key_path     = "<pem_private_key_path>"
 # Region
 region = "<oci_region>"
 
-# availability Domain 
-availability_domain_name = "<availability_domain_name>" # for example GrCH:US-ASHBURN-AD-1
+# availability Domain
+availability_domain_number = "1" # Example: 1, 2, 3
 
 # Compartment
 compartment_ocid        = "<compartment_ocid>"
 
 # PostgreSQL Password
+# The password must start with a letter, and it can contain letters (uppercase, lowercase), numbers, and the symbols _ $ #
+# Minimum length 12 and max is 30
 postgresql_password     = "<postgresql_password>"
 
-# PostgreSQL Version (supported versions 9.6, 10, 11, 12, 13)
-postgresql_version      = "<postgresql_version>"
+# PostgreSQL Version (supported versions 9.6, 10, 11, 12, 13, 14)
+postgresql_version      = "14"
+
+# Cidr block that will be added in the firewall-cmd trusted zone on the instances running the postgresql server.
+# Please add a cidr block from where you run postgresql client.
+pg_whitelist_cidr = "" # Example "10.0.0.0/16"
+
+
+### Using existing network
+use_existing_vcn         = true
+postgresql_vcn           = "<postgresqls_vcn_ocid>"
+postgresql_subnet        = "<postgresql_subnet_ocid>"
+create_in_private_subnet = true # In case of deploying in a private subnet, a Bastion Service will be created.
+
+
+linux_os_version = "8" # (supported versions : 7.9, 8)
+
+# SSH KEY
+# If you're using a PRIVATE subnet, the bastion service will be created.
+# The code will upload on the instances both the ssh public key that you provide and the one that will be GENERATED.
+# The bastion will automatically create sessions for instances using the private key GENERATED.
+# If you want to connect using your ssh key, create new sessions with your public key. You can also use the GENERATED ssh key.
+ssh_public_key = "<your_public_ssh_key" #optional
+
 
-# Optional first HotStandby 
-postgresql_deploy_hotstandby1 = true
-postgresql_hotstandby1_ad = "<availability_domain_name>" # for example GrCH:US-ASHBURN-AD-2
-postgresql_hotstandby1_fd = "<postgresql_hotstandby1_fd>" # for example FAULT-DOMAIN-2
 
-# Optional second HotStandby 
-postgresql_deploy_hotstandby2 = true
-postgresql_hotstandby2_ad = "<availability_domain_name>" # for example GrCH:US-ASHBURN-AD-3
-postgresql_hotstandby2_fd = "<postgresql_hotstandby2_fd>" # for example FAULT-DOMAIN-3
+# Optional first HotStandby
+postgresql_deploy_hotstandby1 = false
+# PLEASE LEAVE THE postgresql_hotstandby1_ad = "" (empty string) if you're not using it.
+postgresql_hotstandby1_ad = "" # for example 2
+postgresql_hotstandby1_fd = "" # for example 2
 
-````
+# Optional second HotStandby
+postgresql_deploy_hotstandby2 = false
+# PLEASE LEAVE THE postgresql_hotstandby2_ad = "" (empty string) if you're not using it.
+postgresql_hotstandby2_ad = "" # for example 1
+postgresql_hotstandby2_fd = "" # for example 3
+
+
+```
 
 ### Create the Resources
+
 Run the following commands:
 
     terraform init
@@ -90,11 +121,13 @@ Run the following commands:
     terraform apply
 
 ### Destroy the Deployment
+
 When you no longer need the deployment, you can run this command to destroy the resources:
 
     terraform destroy
 
 ## Deploy as a Module
+
 It's possible to utilize this repository as remote module, providing the necessary inputs:
 
 ```
@@ -107,11 +140,15 @@ module "arch-postgresql" {
   region                        = "<oci_region>"
   availability_domain_name       = "<availability_domain_name>"
   compartment_ocid              = "<compartment_ocid>"
-  use_existing_vcn              = true # You can inject your own VCN and subnet 
+  use_existing_vcn              = true # You can inject your own VCN and subnet
   create_in_private_subnet      = true # Subnet should be associated with NATGW and proper Route Table.
   postgresql_vcn                = oci_core_virtual_network.my_vcn.id # Injected VCN
   postgresql_subnet             = oci_core_subnet.my_private_subnet.id # Injected Private Subnet
   postgresql_password           = "<password>"
+  postgresql_version            = "14"
+  pg_whitelist_cidr             = "" # Example "10.0.0.0/16"
+  linux_os_version              = "8"
+  ssh_public_key                = "<your_public_ssh_key"
   postgresql_deploy_hotstandby1 = true # if we want to setup hotstandby1
   postgresql_deploy_hotstandby2 = true # if we want to setup hotstandby2
 }
@@ -122,12 +159,13 @@ module "arch-postgresql" {
 ![](./images/postgre-oci.png)
 
 ## Contributing
-This project is open source.  Please submit your contributions by forking this repository and submitting a pull request!  Oracle appreciates any contributions that are made by the open source community.
+
+This project is open source. Please submit your contributions by forking this repository and submitting a pull request! Oracle appreciates any contributions that are made by the open source community.
 
 ## License
+
 Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
 See [LICENSE](LICENSE) for more details.
-
diff --git a/bastion.tf b/bastion.tf
index 9fb7ae3..0993297 100644
--- a/bastion.tf
+++ b/bastion.tf
@@ -64,7 +64,7 @@ resource "oci_bastion_bastion" "bastion-service" {
   compartment_id               = var.compartment_ocid
   target_subnet_id             = !var.use_existing_vcn ? oci_core_subnet.postgresql_subnet[0].id : var.postgresql_subnet
   client_cidr_block_allow_list = ["0.0.0.0/0"]
-  defined_tags                 = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags                 = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
   name                         = "BastionService${random_id.tag.hex}"
   max_session_ttl_in_seconds   = 10800
 }
diff --git a/block_volume.tf b/block_volume.tf
index 8b66e7c..3ac447f 100644
--- a/block_volume.tf
+++ b/block_volume.tf
@@ -3,11 +3,11 @@
 
 resource "oci_core_volume" "postgresql_master_volume" {
   count               = var.add_iscsi_volume ? 1 : 0
-  availability_domain = var.availability_domain_name
+  availability_domain = local.get_ad
   compartment_id      = var.compartment_ocid
   display_name        = "PostgreSQL_Master_Volume"
   size_in_gbs         = var.iscsi_volume_size_in_gbs
-  defined_tags        = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags        = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_volume_attachment" "postgresql_master_volume_attachment" {
@@ -32,11 +32,11 @@ resource "oci_core_volume_backup_policy_assignment" "postgresql_master_volume_ba
 
 resource "oci_core_volume" "postgresql_hotstandby1_volume" {
   count               = (var.postgresql_deploy_hotstandby1 && var.add_iscsi_volume && var.boot_volume_initial_backup) ? 1 : 0
-  availability_domain = var.postgresql_hotstandby1_ad == "" ? var.availability_domain_name : var.postgresql_hotstandby1_ad
+  availability_domain = var.postgresql_hotstandby1_ad == "" ? local.get_ad : local.standby2_ad
   compartment_id      = var.compartment_ocid
   display_name        = "PostgreSQL_HotStandby1_Volume"
   size_in_gbs         = var.iscsi_volume_size_in_gbs
-  defined_tags        = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags        = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_volume_attachment" "postgresql_hotstandby1_volume_attachment" {
@@ -61,11 +61,11 @@ resource "oci_core_volume_backup_policy_assignment" "postgresql_hotstandby1_volu
 
 resource "oci_core_volume" "postgresql_hotstandby2_volume" {
   count               = (var.postgresql_deploy_hotstandby2 && var.add_iscsi_volume) ? 1 : 0
-  availability_domain = var.postgresql_hotstandby2_ad == "" ? var.availability_domain_name : var.postgresql_hotstandby2_ad
+  availability_domain = var.postgresql_hotstandby2_ad == "" ? local.get_ad : local.standby2_ad
   compartment_id      = var.compartment_ocid
   display_name        = "PostgreSQL_HotStandby2_Volume"
   size_in_gbs         = var.iscsi_volume_size_in_gbs
-  defined_tags        = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags        = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_volume_attachment" "postgresql_hotstandby2_volume_attachment" {
diff --git a/compute.tf b/compute.tf
index 27aeafc..10bf104 100644
--- a/compute.tf
+++ b/compute.tf
@@ -20,7 +20,7 @@ data "template_cloudinit_config" "cloud_init" {
 }
 
 resource "oci_core_instance" "postgresql_master" {
-  availability_domain = var.availability_domain_name
+  availability_domain = local.get_ad
   compartment_id      = var.compartment_ocid
   display_name        = "PostgreSQL_Master"
   shape               = var.postgresql_instance_shape
@@ -46,7 +46,7 @@ resource "oci_core_instance" "postgresql_master" {
     }
   }
 
-  fault_domain = var.postgresql_master_fd
+  fault_domain = contains(["1", "2", "3"],tostring(var.postgresql_master_fd)) ? "FAULT-DOMAIN-${var.postgresql_master_fd}" : "FAULT-DOMAIN-1"
 
   create_vnic_details {
     subnet_id        = !var.use_existing_vcn ? oci_core_subnet.postgresql_subnet[0].id : var.postgresql_subnet
@@ -69,7 +69,7 @@ resource "oci_core_instance" "postgresql_master" {
     command = "sleep 240"
   }
 
-  defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_boot_volume_backup" "postgresql_master_boot_volume_backup" {
@@ -87,7 +87,7 @@ resource "oci_core_volume_backup_policy_assignment" "postgresql_master_boot_volu
 
 resource "oci_core_instance" "postgresql_hotstandby1" {
   count               = var.postgresql_deploy_hotstandby1 ? 1 : 0
-  availability_domain = var.postgresql_hotstandby1_ad == "" ? var.availability_domain_name : var.postgresql_hotstandby1_ad
+  availability_domain = var.postgresql_hotstandby1_ad == "" ? local.get_ad : local.standby1_ad
   compartment_id      = var.compartment_ocid
   display_name        = "PostgreSQL_HotStandby1"
   shape               = var.postgresql_hotstandby1_shape
@@ -114,7 +114,7 @@ resource "oci_core_instance" "postgresql_hotstandby1" {
   }
 
 
-  fault_domain = var.postgresql_hotstandby1_fd
+  fault_domain = contains(["1", "2", "3"],tostring(var.postgresql_hotstandby1_fd)) ? "FAULT-DOMAIN-${var.postgresql_hotstandby1_fd}" : "FAULT-DOMAIN-2"
 
   create_vnic_details {
     subnet_id        = !var.use_existing_vcn ? oci_core_subnet.postgresql_subnet[0].id : var.postgresql_subnet
@@ -137,7 +137,7 @@ resource "oci_core_instance" "postgresql_hotstandby1" {
     command = "sleep 240"
   }
 
-  defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_boot_volume_backup" "postgresql_hotstandby1_boot_volume_backup" {
@@ -155,7 +155,7 @@ resource "oci_core_volume_backup_policy_assignment" "postgresql_hotstandby1_boot
 
 resource "oci_core_instance" "postgresql_hotstandby2" {
   count               = var.postgresql_deploy_hotstandby2 ? 1 : 0
-  availability_domain = var.postgresql_hotstandby2_ad == "" ? var.availability_domain_name : var.postgresql_hotstandby2_ad
+  availability_domain = var.postgresql_hotstandby2_ad == "" ? local.get_ad : local.standby2_ad
   compartment_id      = var.compartment_ocid
   display_name        = "PostgreSQL_HotStandby2"
   shape               = var.postgresql_hotstandby2_shape
@@ -182,7 +182,7 @@ resource "oci_core_instance" "postgresql_hotstandby2" {
     }
   }
 
-  fault_domain = var.postgresql_hotstandby2_fd
+  fault_domain = contains(["1", "2", "3"],tostring(var.postgresql_hotstandby2_fd)) ? "FAULT-DOMAIN-${var.postgresql_hotstandby2_fd}" : "FAULT-DOMAIN-3"
 
   create_vnic_details {
     subnet_id        = !var.use_existing_vcn ? oci_core_subnet.postgresql_subnet[0].id : var.postgresql_subnet
@@ -205,7 +205,7 @@ resource "oci_core_instance" "postgresql_hotstandby2" {
     command = "sleep 240"
   }
 
-  defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_boot_volume_backup" "postgresql_hotstandby2_boot_volume_backup" {
diff --git a/datasources.tf b/datasources.tf
index d4a3896..cb559c0 100644
--- a/datasources.tf
+++ b/datasources.tf
@@ -1,15 +1,32 @@
 ## Copyright (c) 2022 Oracle and/or its affiliates.
 ## All rights reserved. The Universal Permissive License (UPL), Version 1.0 as shown at http://oss.oracle.com/licenses/upl
 
+
+
+locals {
+  get_ad = "${lookup(data.oci_identity_availability_domains.ads.availability_domains[var.availability_domain_number - 1], "name")}"
+  standby1_ad = var.postgresql_hotstandby1_ad == "" ? null : "${lookup(data.oci_identity_availability_domains.ads.availability_domains[var.postgresql_hotstandby1_ad - 1], "name")}"
+  standby2_ad = var.postgresql_hotstandby2_ad == "" ? null : "${lookup(data.oci_identity_availability_domains.ads.availability_domains[var.postgresql_hotstandby2_ad - 1], "name")}"
+
+}
+
+
+data "oci_identity_availability_domains" "ads" {
+    #Required
+    compartment_id = var.compartment_ocid
+}
+
+
+
 data "oci_core_vnic_attachments" "postgresql_master_vnics" {
   compartment_id      = var.compartment_ocid
-  availability_domain = var.availability_domain_name
+  availability_domain = local.get_ad
   instance_id         = oci_core_instance.postgresql_master.id
 }
 
 
 data "oci_core_vnic_attachments" "postgresql_master_primaryvnic_attach" {
-  availability_domain = var.availability_domain_name
+  availability_domain = local.get_ad
   compartment_id      = var.compartment_ocid
   instance_id         = oci_core_instance.postgresql_master.id
 }
@@ -20,7 +37,7 @@ data "oci_core_vnic" "postgresql_master_primaryvnic" {
 
 data "oci_core_vnic_attachments" "postgresql_hotstandby1_primaryvnic_attach" {
   count               = var.postgresql_deploy_hotstandby1 ? 1 : 0
-  availability_domain = var.postgresql_hotstandby1_ad
+  availability_domain = local.standby1_ad
   compartment_id      = var.compartment_ocid
   instance_id         = oci_core_instance.postgresql_hotstandby1[count.index].id
 }
@@ -32,7 +49,7 @@ data "oci_core_vnic" "postgresql_hotstandby1_primaryvnic" {
 
 data "oci_core_vnic_attachments" "postgresql_hotstandby2_primaryvnic_attach" {
   count               = var.postgresql_deploy_hotstandby2 ? 1 : 0
-  availability_domain = var.postgresql_hotstandby2_ad
+  availability_domain = local.standby2_ad
   compartment_id      = var.compartment_ocid
   instance_id         = oci_core_instance.postgresql_hotstandby2[count.index].id
 }
diff --git a/network.tf b/network.tf
index 6f3fbd9..333b4d6 100644
--- a/network.tf
+++ b/network.tf
@@ -7,14 +7,14 @@ resource "oci_core_virtual_network" "postgresql_vcn" {
   compartment_id = var.compartment_ocid
   display_name   = "PostgreSQLVCN"
   dns_label      = "postgresvcn"
-  defined_tags   = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags   = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_drg" "postgresql_drg" {
   count          = (var.create_in_private_subnet && var.create_drg_for_private_subnet && !var.use_existing_vcn) ? 1 : 0
   compartment_id = var.compartment_ocid
   display_name   = "PostgreSQLDRG"
-  defined_tags   = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags   = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_drg_attachment" "postgresql_drg_attachment" {
@@ -29,7 +29,7 @@ resource "oci_core_internet_gateway" "postgresql_igw" {
   compartment_id = var.compartment_ocid
   display_name   = "PostgreSQLIGW"
   vcn_id         = oci_core_virtual_network.postgresql_vcn[0].id
-  defined_tags   = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags   = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_route_table" "postgresql_rt" {
@@ -43,7 +43,7 @@ resource "oci_core_route_table" "postgresql_rt" {
     destination_type  = "CIDR_BLOCK"
     network_entity_id = oci_core_internet_gateway.postgresql_igw[count.index].id
   }
-  defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_nat_gateway" "postgresql_nat" {
@@ -51,7 +51,7 @@ resource "oci_core_nat_gateway" "postgresql_nat" {
   compartment_id = var.compartment_ocid
   display_name   = "PostgreSQLNAT"
   vcn_id         = oci_core_virtual_network.postgresql_vcn[0].id
-  defined_tags   = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags   = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_route_table" "postgresql_rt2" {
@@ -65,7 +65,7 @@ resource "oci_core_route_table" "postgresql_rt2" {
     destination_type  = "CIDR_BLOCK"
     network_entity_id = oci_core_nat_gateway.postgresql_nat[count.index].id
   }
-  defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_subnet" "postgresql_subnet" {
@@ -79,6 +79,6 @@ resource "oci_core_subnet" "postgresql_subnet" {
   route_table_id             = var.create_in_private_subnet ? oci_core_route_table.postgresql_rt2[0].id : oci_core_route_table.postgresql_rt[0].id
   dhcp_options_id            = oci_core_virtual_network.postgresql_vcn[0].default_dhcp_options_id
   prohibit_public_ip_on_vnic = var.create_in_private_subnet ? true : false
-  defined_tags               = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags               = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
diff --git a/remote.tf b/remote.tf
index 4470816..b2d919c 100644
--- a/remote.tf
+++ b/remote.tf
@@ -9,6 +9,7 @@ data "template_file" "postgresql_install_binaries_sh" {
     pg_version_no_dot = replace(var.postgresql_version, ".", "")
     pg_version        = var.postgresql_version
     pg_whitelisted_ip = var.pg_whitelisted_ip
+    pg_whitelist_cidr = var.pg_whitelist_cidr
   }
 }
 
@@ -20,6 +21,7 @@ data "template_file" "postgresql_master_initdb_sh" {
     pg_version_no_dot = replace(var.postgresql_version, ".", "")
     pg_version        = var.postgresql_version
     add_iscsi_volume  = var.add_iscsi_volume
+    pg_whitelist_cidr = var.pg_whitelist_cidr
   }
 }
 
diff --git a/schema.yaml b/schema.yaml
index f30acc7..1902d11 100644
--- a/schema.yaml
+++ b/schema.yaml
@@ -14,19 +14,22 @@
       - tenancy_ocid
       - region
       - release
-      - use_existing_vcn
-      - postgresql_vcn
-      - postgresql_subnet
+      - fingerprint
+      - private_key_path
+      - user_ocid
       
     - title: Required Configuration  
       variables:
       - compartment_ocid
-      - availability_domain_name
+      - availability_domain_number
       - postgresql_version
       - postgresql_password
       - postgresql_deploy_hotstandby1
       - postgresql_deploy_hotstandby2
       - create_in_private_subnet
+      - use_existing_vcn
+      - postgresql_vcn
+      - postgresql_subnet
       - show_advanced
 
     - title: Network Optional Configuration
@@ -34,6 +37,7 @@
           and:
             - show_advanced
       variables:
+      - pg_whitelist_cidr
       - pg_whitelisted_ip 
       - postgresql_vcn_cidr
       - postgresql_subnet_cidr
@@ -92,7 +96,6 @@
       - postgresql_hotstandby2_flex_shape_memory
 
     variables:
-
       show_advanced:
         type: boolean
         title: "Show advanced options?"
@@ -110,19 +113,26 @@
         description: "Choose whitelisted IP in a public scenario (for example, 89.64.91.8). It will give you the ability to access the database from your laptop and PGAdmin tool."
         default: ""
 
+      pg_whitelist_cidr: 
+        type: string
+        required: false
+        title: "Whitelisted CIDR Block"
+        description: "Choose whitelisted Cidr Block to be added in the firewall-cmd in trusted zone. It will give you the ability to access the database from your laptop and PGAdmin tool."
+        default: ""
+
       postgresql_deploy_hotstandby1:
         type: boolean
         title: "Deploy first PostgreSQL HotStandby?"
         description: "Check the box to deploy first PostgreSQL HotStandby."
         visible: true
-        default: true
+        default: false
 
       postgresql_deploy_hotstandby2:
         type: boolean
         title: "Deploy second PostgreSQL HotStandby?"
         description: "Check the box to deploy second PostgreSQL HotStandby."
         visible: true
-        default: true
+        default: false
       
       compartment_ocid:
         type: oci:identity:compartment:id
@@ -138,12 +148,20 @@
         title: Region
         description: "Region where you want to deploy the resources defined by this stack."
 
-      availability_domain_name:
-        type: oci:identity:availabilitydomain:name
+      # availability_domain_number:
+      #   type: oci:identity:availabilitydomain:name
+      #   required: true
+      #   visible: true
+      #   title: "Availability Domain for master PostgreSQL"
+      #   description: "Availability Domain to be chosen for master PostgreSQL."
+      #   dependsOn:
+      #     compartmentId: ${compartment_ocid}
+      availability_domain_number:
+        type: string
         required: true
         visible: true
-        title: "Availability Domain for master PostgreSQL"
-        description: "Availability Domain to be chosen for master PostgreSQL."
+        title: "Availability Domain number for Postgresql"
+        default: "1"
         dependsOn:
           compartmentId: ${compartment_ocid}
 
@@ -176,6 +194,7 @@
           - "11"
           - "10"          
           - "9.6" 
+          - "14"
 
       create_in_private_subnet:
         type: boolean
@@ -271,7 +290,9 @@
 
       postgresql_vcn_cidr:
         type: string
-        visible: true
+        visible:
+          not:
+            - use_existing_vcn
         required: false
         pattern: "^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\\/(3[0-2]|[1-2]?[0-9])$"
         title: "VCN CIDR"
@@ -280,7 +301,9 @@
 
       postgresql_subnet_cidr:
         type: string
-        visible: true
+        visible:
+          not:
+            - use_existing_vcn
         required: false
         pattern: "^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\\/(3[0-2]|[1-2]?[0-9])$"
         title: "VCN CIDR"
@@ -290,12 +313,12 @@
       create_drg_for_private_subnet:
         type: boolean
         visible: 
-          and:
-            - create_in_private_subnet
+          not:
+            - use_existing_vcn
         required: false
         title: "Create DRG for Private Subnet scenario"
         description: "Providing an option to create Dynamic Routing Gateway (DRG) for VCN and afterwards you can connect to your private subnet from on-premise."
-        default: true        
+        default: false        
 
       postgresql_instance_shape:
         type: oci:core:instanceshape:name
@@ -372,6 +395,7 @@
         description: "An Operating System version that determines the operating system version for the instance."
         default: "8"
         enum: 
+          - "7.9"
           - "8"
 
       postgresql_master_fd:
@@ -379,11 +403,11 @@
         required: false
         title: "PostgreSQL Master Fault Domain"
         description: "Choose Fault Domain for PostgreSQL Master."
-        default: "FAULT-DOMAIN-1"
+        default: "1"
         enum:
-          - "FAULT-DOMAIN-1"
-          - "FAULT-DOMAIN-2"  
-          - "FAULT-DOMAIN-3"
+          - "1"
+          - "2"  
+          - "3"
 
       postgresql_replicat_username:
         type: string
@@ -391,24 +415,33 @@
         title: "PostgreSQL Replicat Username"
         description: "Type PostgreSQL Replicat Username"
 
+      # postgresql_hotstandby1_ad:
+      #   type: oci:identity:availabilitydomain:name
+      #   required: false
+      #   title: "AD for the first PostgreSQL HotStandby"
+      #   description: "Availability Domain for the first PostgreSQL HotStandby."
+      #   dependsOn:
+      #     compartmentId: ${compartment_ocid}
       postgresql_hotstandby1_ad:
-        type: oci:identity:availabilitydomain:name
+        type: string
         required: false
-        title: "AD for the first PostgreSQL HotStandby"
+        title: "AD number for the first PostgreSQL HotStandby"
         description: "Availability Domain for the first PostgreSQL HotStandby."
         dependsOn:
           compartmentId: ${compartment_ocid}
 
+
+
       postgresql_hotstandby1_fd:
         type: enum
         required: false
         title: "The first PostgreSQL HotStandby's Fault Domain"
         description: "Choose Fault Domain for the first PostgreSQL HotStandby."
-        default: "FAULT-DOMAIN-2"
+        default: "2"
         enum:
-          - "FAULT-DOMAIN-1"
-          - "FAULT-DOMAIN-2"  
-          - "FAULT-DOMAIN-3"
+          - "1"
+          - "2"  
+          - "3"
 
       postgresql_hotstandby1_shape:
         type: oci:core:instanceshape:name
@@ -469,24 +502,33 @@
                 - postgresql_hotstandby1_shape
                 - "VM.Standard3.Flex"
 
+      # postgresql_hotstandby2_ad:
+      #   type: oci:identity:availabilitydomain:name
+      #   required: false
+      #   title: "AD for the second PostgreSQL HotStandby"
+      #   description: "Availability Domain for the second PostgreSQL HotStandby."
+      #   dependsOn:
+      #     compartmentId: ${compartment_ocid}
+
       postgresql_hotstandby2_ad:
-        type: oci:identity:availabilitydomain:name
+        type: string
         required: false
-        title: "AD for the second PostgreSQL HotStandby"
+        title: "AD number for the second PostgreSQL HotStandby"
         description: "Availability Domain for the second PostgreSQL HotStandby."
         dependsOn:
           compartmentId: ${compartment_ocid}
 
+
       postgresql_hotstandby2_fd:
         type: enum
         required: false
         title: "The second PostgreSQL HotStandby's Fault Domain"
         description: "Choose Fault Domain for the second PostgreSQL HotStandby."
-        default: "FAULT-DOMAIN-3"
+        default: "3"
         enum:
-          - "FAULT-DOMAIN-1"
-          - "FAULT-DOMAIN-2"  
-          - "FAULT-DOMAIN-3"
+          - "1"
+          - "2"  
+          - "3"
 
       postgresql_hotstandby2_shape:
         type: oci:core:instanceshape:name
@@ -546,6 +588,31 @@
               - eq:
                 - postgresql_hotstandby2_shape
                 - "VM.Standard3.Flex"
+      use_existing_vcn:
+        type: boolean
+        title: "Use Existing VCN"
+        description: "Click to use existing VCN, otherwise VCN and Subnets will be created"
+        required: true
+        default: false
+
+      postgresql_vcn:
+        type: oci:core:vcn:id
+        title: "Existing VCN"
+        description: "Select Existing VCN"
+        dependsOn:
+          compartmentId: compartment_ocid
+        visible: use_existing_vcn
+        required: true
+
+      postgresql_subnet:
+        type: oci:core:subnet:id
+        title: "Postgresql_subnet"
+        description: "Select Subnet for Postgresql Instances and Bastion service"
+        dependsOn:
+          compartmentId: compartment_ocid
+          vcnId: postgresql_vcn
+        visible: use_existing_vcn
+        required: true
 
     outputs:
 
@@ -579,3 +646,4 @@
         type: string
         visible: true
 
+
diff --git a/scripts/postgresql_install_binaries.sh b/scripts/postgresql_install_binaries.sh
index cda7c48..40073ba 100644
--- a/scripts/postgresql_install_binaries.sh
+++ b/scripts/postgresql_install_binaries.sh
@@ -47,20 +47,33 @@ then
    sudo yum-config-manager --enable ol7_developer_EPEL
    sudo yum install -y llvm5.0-devel
    sudo yum install -y postgresql${pg_version_no_dot}-devel
+   sudo yum install -y postgis34_${pg_version_no_dot}
+   sudo yum install -y pgvector_${pg_version_no_dot}
    echo '-[100%]-> Install PostgreSQL pg_utility (postgresql${pg_version_no_dot}-devel OL7) installed.'
 fi 
 if [[ $(uname -r | sed 's/^.*\(el[0-9]\+\).*$/\1/') == "el8" ]]
 then 
-   sudo yum-config-manager --enable ol8_developer
-   sudo yum-config-manager --enable ol8_developer_EPEL
-   sudo yum install -y llvm5.0-devel
-   sudo yum install -y postgresql${pg_version_no_dot}-devel
-   echo '-[100%]-> Install PostgreSQL pg_utility (postgresql${pg_version_no_dot}-devel OL8) installed.'
+  sudo dnf config-manager --enable ol8_developer
+  sudo dnf config-manager --enable ol8_developer_EPEL
+  sudo dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+  sudo dnf -y install dnf-plugins-core
+  sudo dnf config-manager --enable ol8_codeready_builder
+  sudo yum install -y llvm-devel
+  sudo yum install -y postgresql${pg_version_no_dot}-devel
+  sudo yum install -y postgis34_${pg_version_no_dot}
+  sudo yum install -y pgvector_${pg_version_no_dot}
+  echo '-[100%]-> Install PostgreSQL pg_utility (postgresql${pg_version_no_dot}-devel OL8) installed.'
 fi 
 
 # Setting firewall rules
 echo '--> Setting firewall rules...'
 export pg_whitelisted_ip='${pg_whitelisted_ip}'
+export pg_whitelist_cidr='${pg_whitelist_cidr}'
+
+if [[ $pg_whitelist_cidr != "" ]]; then 
+   sudo -u root bash -c "firewall-cmd --permanent --zone=trusted --add-source=${pg_whitelist_cidr}"
+   echo '-[50%]-> Whitelisted CIDR ${pg_whitelist_cidr} added to firewall rules.'
+fi
 if [[ $pg_whitelisted_ip != "" ]]; then 
    sudo -u root bash -c "firewall-cmd --permanent --zone=trusted --add-source=${pg_whitelisted_ip}/32"
    echo '-[50%]-> Whitelisted IP ${pg_whitelisted_ip} added to firewall rules.'
diff --git a/scripts/postgresql_master_initdb.sh b/scripts/postgresql_master_initdb.sh
index 3f11690..2b2f05c 100644
--- a/scripts/postgresql_master_initdb.sh
+++ b/scripts/postgresql_master_initdb.sh
@@ -16,13 +16,27 @@ else
 	echo '-[100%]-> PostgreSQL Setup InitDB successfully finished.'
 fi	
 
-if [[ $add_iscsi_volume == "true" ]]; then 
+
+
+export pg_whitelist_cidr='${pg_whitelist_cidr}'
+if [[ $add_iscsi_volume == "true" ]]; then
 	echo '--> Adding iSCSI volume to PostgreSQL configuration...'
 	sudo mkdir /data/pgsql
 	sudo chown -R postgres:postgres /data/pgsql
 	sudo -u postgres bash -c "/usr/pgsql-${pg_version_no_dot}/bin/initdb --pgdata=/data/pgsql"
 	sudo sed -i 's/Environment=PGDATA=\/var\/lib\/pgsql\/${pg_version_no_dot}\/data\//Environment=PGDATA=\/data\/pgsql\//g' /usr/lib/systemd/system/postgresql-${pg_version_no_dot}.service 
 	echo '-[100%]-> iSCSI volume added to PostgreSQL configuration.'
+	sudo -u root bash -c "echo 'listen_addresses = '\''0.0.0.0'\'' ' | sudo tee -a /data/pgsql/postgresql.conf"
+	sudo sed -i 's/^max_connections = [0-9]\+/max_connections = 200/' /data/pgsql/postgresql.conf
+	if [[ $pg_whitelist_cidr != "" ]]; then
+		sudo -u root bash -c "echo 'host all all ${pg_whitelist_cidr} md5' | sudo tee -a /data/pgsql/pg_hba.conf"
+	fi
+else
+	sudo sed -i 's/^max_connections = [0-9]\+/max_connections = 200/' /var/lib/pgsql/${pg_version}/data/postgresql.conf
+	sudo -u root bash -c "echo 'listen_addresses = '\''0.0.0.0'\'' ' | sudo tee -a /var/lib/pgsql/${pg_version}/data/postgresql.conf"
+	if [[ $pg_whitelist_cidr != "" ]]; then
+		sudo -u root bash -c "echo 'host all all ${pg_whitelist_cidr} md5' | sudo tee -a /var/lib/pgsql/${pg_version}/data/pg_hba.conf"
+	fi
 fi
 
 echo '--> Enabling and starting PostgreSQL systemctl service...'
@@ -31,6 +45,20 @@ sudo systemctl start postgresql-${pg_version}
 sudo systemctl status postgresql-${pg_version} --no-pager
 echo '-[100%]-> PostgreSQL service started.'
 
+
+
+
+echo '--> Change password of postgres user...'
+echo "postgres:${pg_password}" | chpasswd
+echo '-[100%]-> postgres user password changed.' 
+
+
+echo '--> Change postgres db password...'
+sudo -u postgres bash -c "psql -U postgres -d postgres -c \"alter user postgres with password '${pg_password}';\""
+echo '-[100%]-> Password for postgres updated.' 
+
+
+
 echo '--> Showing the logs of PostgreSQL with tail -5 command...'
 if [[ $pg_version == "9.6" ]]; then 
 	if [[ $add_iscsi_volume == "true" ]]; then 
@@ -47,6 +75,11 @@ else
 fi
 echo '-[100%]-> PostgreSQL logs printed out.'
 
+
+
+
+
+
 echo '#####################################'
 echo 'PostgreSQL Master initdb finished.'
 echo '#####################################'
\ No newline at end of file
diff --git a/scripts/postgresql_master_setup.sh b/scripts/postgresql_master_setup.sh
index 7f0631a..f6ef579 100644
--- a/scripts/postgresql_master_setup.sh
+++ b/scripts/postgresql_master_setup.sh
@@ -7,9 +7,7 @@ echo '#################################################'
 export pg_version='${pg_version}'
 export add_iscsi_volume='${add_iscsi_volume}'
 
-echo '--> Change password of postgres user...'
-echo "postgres:${pg_password}" | chpasswd
-echo '-[100%]-> postgres user password changed.' 
+
 
 echo '--> Updating firewall rules with hotstandby1 IP (${pg_hotstandby_ip}) on master host...'
 sudo -u root bash -c "firewall-cmd --permanent --zone=trusted --add-source=${pg_hotstandby_ip}/32"
@@ -21,7 +19,6 @@ echo '-[100%]-> Firewall updated with hotstandby1 IP (${pg_hotstandby_ip}) on ma
 echo '--> Create replication user...'
 chown postgres /tmp/postgresql_master_setup.sql
 sudo -u postgres bash -c "psql -d template1 -f /tmp/postgresql_master_setup.sql"
-sudo -u postgres bash -c "psql -U postgres -d postgres -c \"alter user postgres with password '${pg_password}';\""
 echo '-[100%]-> Replication user created.' 
 
 if [[ $add_iscsi_volume == "true" ]]; then 
@@ -36,7 +33,6 @@ if [[ $add_iscsi_volume == "true" ]]; then
 	   sudo -u root bash -c "echo 'wal_keep_segments = 8' | sudo tee -a /data/pgsql/postgresql.conf"
     fi
     sudo -u root bash -c "echo 'hot_standby = on' | sudo tee -a /data/pgsql/postgresql.conf"
-    sudo -u root bash -c "echo 'listen_addresses = '\''0.0.0.0'\'' ' | sudo tee -a /data/pgsql/postgresql.conf"
     sudo -u root bash -c "chown postgres /data/pgsql/postgresql.conf"
     echo '-[100%]-> File postgresql.conf updated with WAL support.' 
 
@@ -64,7 +60,6 @@ else
 		sudo -u root bash -c "echo 'wal_keep_segments = 8' | sudo tee -a /var/lib/pgsql/${pg_version}/data/postgresql.conf"
 	fi
 	sudo -u root bash -c "echo 'hot_standby = on' | sudo tee -a /var/lib/pgsql/${pg_version}/data/postgresql.conf"
-	sudo -u root bash -c "echo 'listen_addresses = '\''0.0.0.0'\'' ' | sudo tee -a /var/lib/pgsql/${pg_version}/data/postgresql.conf"
 	sudo -u root bash -c "chown postgres /var/lib/pgsql/${pg_version}/data/postgresql.conf"
     echo '-[100%]-> File postgresql.conf updated with WAL support.' 
 
diff --git a/scripts/postgresql_standby_setup.sh b/scripts/postgresql_standby_setup.sh
index 94dc2fd..44b3a1e 100644
--- a/scripts/postgresql_standby_setup.sh
+++ b/scripts/postgresql_standby_setup.sh
@@ -31,13 +31,7 @@ if [[ $add_iscsi_volume == "true" ]]; then
 	echo '-[100%]-> Initial backup of database taken.'
 
 	echo '--> Updating content of recovery.conf/postgresql.conf files...'
-	if [[ $pg_version == "13" ]]; then 
-		touch /data/pgsql/standby.signal
-		touch /data/pgsql/recovery.signal
-		sudo -u root bash -c "echo 'primary_conninfo  = '\''host=${pg_master_ip} port=5432 user=${pg_replicat_username} password=${pg_replicat_password}'\'' ' | sudo tee -a /data/pgsql/postgresql.conf"
-    	sudo -u root bash -c "echo 'recovery_target_timeline = '\''latest'\'' ' | sudo tee -a /data/pgsql/postgresql.conf"
-    	sudo -u root bash -c "chown postgres /data/pgsql/postgresql.conf"
-	elif [[ $pg_version == "12"  ]]; then
+	if [[ $pg_version -ge "12" ]]; then 
 		touch /data/pgsql/standby.signal
 		touch /data/pgsql/recovery.signal
 		sudo -u root bash -c "echo 'primary_conninfo  = '\''host=${pg_master_ip} port=5432 user=${pg_replicat_username} password=${pg_replicat_password}'\'' ' | sudo tee -a /data/pgsql/postgresql.conf"
@@ -49,6 +43,7 @@ if [[ $add_iscsi_volume == "true" ]]; then
     	sudo -u root bash -c "echo 'recovery_target_timeline = '\''latest'\'' ' | sudo tee -a /data/pgsql/recovery.conf"
     	sudo -u root bash -c "chown postgres /data/pgsql/recovery.conf"
 	fi
+	sed -i 's/^max_connections = [0-9]\+/max_connections = 200/' /data/pgsql/postgresql.conf
 	echo '-[100%]-> Files recovery.conf/postgresql.conf updated.'
 else 
 	echo '--> Taking initial backup of database...'
@@ -57,13 +52,7 @@ else
 	echo '-[100%]-> Initial backup of database taken.'	
 
 	echo '--> Updating content of recovery.conf/postgresql.conf files...'
-	if [[ $pg_version == "13" ]]; then 
-		touch /var/lib/pgsql/${pg_version}/data/standby.signal
-		touch /var/lib/pgsql/${pg_version}/data/recovery.signal
-		sudo -u root bash -c "echo 'primary_conninfo  = '\''host=${pg_master_ip} port=5432 user=${pg_replicat_username} password=${pg_replicat_password}'\'' ' | sudo tee -a /var/lib/pgsql/${pg_version}/data/postgresql.conf"
-    	sudo -u root bash -c "echo 'recovery_target_timeline = '\''latest'\'' ' | sudo tee -a /var/lib/pgsql/${pg_version}/data/postgresql.conf"
-    	sudo -u root bash -c "chown postgres /var/lib/pgsql/${pg_version}/data/postgresql.conf"
-	elif [[ $pg_version == "12"  ]]; then
+	if [[ $pg_version -ge "12" ]]; then 
 		touch /var/lib/pgsql/${pg_version}/data/standby.signal
 		touch /var/lib/pgsql/${pg_version}/data/recovery.signal
 		sudo -u root bash -c "echo 'primary_conninfo  = '\''host=${pg_master_ip} port=5432 user=${pg_replicat_username} password=${pg_replicat_password}'\'' ' | sudo tee -a /var/lib/pgsql/${pg_version}/data/postgresql.conf"
@@ -75,6 +64,7 @@ else
     	sudo -u root bash -c "echo 'recovery_target_timeline = '\''latest'\'' ' | sudo tee -a /var/lib/pgsql/${pg_version}/data/recovery.conf"
     	sudo -u root bash -c "chown postgres /var/lib/pgsql/${pg_version}/data/recovery.conf"
 	fi
+	sed -i 's/^max_connections = [0-9]\+/max_connections = 200/' /var/lib/pgsql/${pg_version}/data/recovery.conf
 	echo '-[100%]-> Files recovery.conf/postgresql.conf updated.'
 fi
 
diff --git a/security-lists.tf b/security-lists.tf
index 0333a56..e6d3b09 100644
--- a/security-lists.tf
+++ b/security-lists.tf
@@ -31,5 +31,5 @@ resource "oci_core_security_list" "postgresql_securitylist" {
       min = "5432"
     }
   }
-  defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+  #defined_tags = { "${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
diff --git a/tags.tf b/tags.tf
index 3f109cd..b857dcf 100644
--- a/tags.tf
+++ b/tags.tf
@@ -1,34 +1,34 @@
-## Copyright (c) 2022 Oracle and/or its affiliates.
-## All rights reserved. The Universal Permissive License (UPL), Version 1.0 as shown at http://oss.oracle.com/licenses/upl
+# ## Copyright (c) 2022 Oracle and/or its affiliates.
+# ## All rights reserved. The Universal Permissive License (UPL), Version 1.0 as shown at http://oss.oracle.com/licenses/upl
 
 resource "random_id" "tag" {
   byte_length = 2
 }
 
-resource "oci_identity_tag_namespace" "ArchitectureCenterTagNamespace" {
-  provider       = oci.homeregion
-  compartment_id = var.compartment_ocid
-  description    = "ArchitectureCenterTagNamespace"
-  name           = "ArchitectureCenter\\deploy-postgresql-db-${random_id.tag.hex}"
+# resource "oci_identity_tag_namespace" "ArchitectureCenterTagNamespace" {
+#   provider       = oci.homeregion
+#   compartment_id = var.compartment_ocid
+#   description    = "ArchitectureCenterTagNamespace"
+#   name           = "ArchitectureCenter\\deploy-postgresql-db-${random_id.tag.hex}"
 
-  provisioner "local-exec" {
-    command = "sleep 10"
-  }
+#   provisioner "local-exec" {
+#     command = "sleep 10"
+#   }
 
-}
+# }
 
-resource "oci_identity_tag" "ArchitectureCenterTag" {
-  provider         = oci.homeregion
-  description      = "ArchitectureCenterTag"
-  name             = "release"
-  tag_namespace_id = oci_identity_tag_namespace.ArchitectureCenterTagNamespace.id
+# resource "oci_identity_tag" "ArchitectureCenterTag" {
+#   provider         = oci.homeregion
+#   description      = "ArchitectureCenterTag"
+#   name             = "release"
+#   tag_namespace_id = oci_identity_tag_namespace.ArchitectureCenterTagNamespace.id
 
-  validator {
-    validator_type = "ENUM"
-    values         = ["release", "${var.release}"]
-  }
+#   validator {
+#     validator_type = "ENUM"
+#     values         = ["release", "${var.release}"]
+#   }
 
-  provisioner "local-exec" {
-    command = "sleep 120"
-  }
-}
+#   provisioner "local-exec" {
+#     command = "sleep 120"
+#   }
+# }
diff --git a/variables.tf b/variables.tf
index a89c74d..bbbdf9a 100644
--- a/variables.tf
+++ b/variables.tf
@@ -2,12 +2,18 @@
 ## All rights reserved. The Universal Permissive License (UPL), Version 1.0 as shown at http://oss.oracle.com/licenses/upl
 
 variable "tenancy_ocid" {}
-variable "user_ocid" {}
-variable "fingerprint" {}
-variable "private_key_path" {}
+variable "user_ocid" {
+  default = "dummy"
+}
+variable "fingerprint" {
+  default = "dummy"
+}
+variable "private_key_path" {
+  default = "/dummy"
+}
 variable "region" {}
 variable "compartment_ocid" {}
-variable "availability_domain_name" {}
+variable "availability_domain_number" {}
 
 variable "release" {
   description = "Reference Architecture Release (OCI Architecture Center)"
@@ -22,6 +28,10 @@ variable "pg_whitelisted_ip" {
   description = "Should be Public host IP Address like 89.64.91.8"
   default     = ""
 }
+variable "pg_whitelist_cidr" {
+  description = "Cidr block to be added in the firewall-cmd in trusted zone"
+  default = ""
+}
 
 variable "postgresql_vcn" {
   default = ""
@@ -74,11 +84,11 @@ variable "instance_os" {
 
 variable "linux_os_version" {
   description = "Operating system version for all Linux instances"
-  default     = "9"
+  default     = "8"
 }
 
 variable "postgresql_master_fd" {
-  default = "FAULT-DOMAIN-1"
+  default = "1"
 }
 
 variable "postgresql_replicat_username" {
@@ -130,7 +140,7 @@ variable "postgresql_deploy_hotstandby1" {
 }
 
 variable "postgresql_hotstandby1_fd" {
-  default = "FAULT-DOMAIN-2"
+  default = "2"
 }
 
 variable "postgresql_hotstandby1_ad" {
@@ -154,7 +164,7 @@ variable "postgresql_deploy_hotstandby2" {
 }
 
 variable "postgresql_hotstandby2_fd" {
-  default = "FAULT-DOMAIN-3"
+  default = "3"
 }
 
 variable "postgresql_hotstandby2_ad" {