diff --git a/terraform/modules/validators/oci_db_validators.tf b/terraform/modules/validators/oci_db_validators.tf
index 0869e2f1..3ba8aad4 100644
--- a/terraform/modules/validators/oci_db_validators.tf
+++ b/terraform/modules/validators/oci_db_validators.tf
@@ -18,7 +18,7 @@ locals {
   missing_oci_db_compartment_id = (var.is_oci_db && !local.has_oci_db_compartment_id)
   missing_oci_db_database_id    = (var.is_oci_db && !local.has_oci_db_database_id)
 
-  missing_oci_db_pdb_service_name = (var.is_oci_db && !local.has_oci_db_pdb_service_name)
+  missing_oci_db_pdb_service_name = (var.is_oci_db || var.oci_db_connection_string != "") && !local.has_oci_db_pdb_service_name
 
   missing_oci_db_vcn_id = (var.is_oci_db && var.oci_db_existing_vcn_id == "")
 
diff --git a/terraform/schema.yaml b/terraform/schema.yaml
index 05d40b72..804f3e3e 100644
--- a/terraform/schema.yaml
+++ b/terraform/schema.yaml
@@ -50,6 +50,7 @@ groupings:
       - ${atp_db_password_id}
       - ${atp_db_level}
       - ${use_oci_db_connection_string}
+      - ${oci_db_connection_string}
       - ${oci_db_compartment_id}
       - ${oci_db_dbsystem_id}
       - ${oci_db_network_compartment_id}
@@ -58,7 +59,6 @@ groupings:
       - ${oci_db_dbhome_major_version}
       - ${oci_db_database_id}
       - ${oci_db_pdb_service_name}
-      - ${oci_db_connection_string}
       - ${oci_db_user}
       - ${oci_db_secret_compartment_id}
       - ${oci_db_password_id}
@@ -1853,18 +1853,13 @@ variables:
         - ${orm_create_mode}
         - ${add_JRF}
         - and:
-            - or:
-                - ${create_new_vcn}
-                - not:
-                    - ${use_oci_db_connection_string}
-            - and:
-                - not:
-                    - eq:
-                        - ${oci_db_dbhome_major_version}
-                        - "11"
+            - not:
                 - eq:
-                    - ${db_strategy}
-                    - "Database System"
+                    - ${oci_db_dbhome_major_version}
+                    - "11"
+            - eq:
+                - ${db_strategy}
+                - "Database System"
 
     type: string
     required: true