diff --git a/roles/dbsoftware19c_install/tasks/main.yml b/roles/dbsoftware19c_install/tasks/main.yml
index dbc2d5a..e1519c2 100755
--- a/roles/dbsoftware19c_install/tasks/main.yml
+++ b/roles/dbsoftware19c_install/tasks/main.yml
@@ -198,7 +198,7 @@
    - dbca_setuprspfile
 
 - name: Creating Oracle 19c Database
-  when: inventory_hostname in groups['dbservers']
+  when: inventory_hostname in groups['dbservers'] and create_database
   remote_user: "{{ root_user }}"
   become: yes
   become_user: "{{ oracle_user }}"
diff --git a/roles/dbsoftware19c_install/vars/main.yml b/roles/dbsoftware19c_install/vars/main.yml
index 76feab0..07357fa 100755
--- a/roles/dbsoftware19c_install/vars/main.yml
+++ b/roles/dbsoftware19c_install/vars/main.yml
@@ -4,6 +4,7 @@ mount_directory:                 "/"
 root_directory:                  "/u01"
 stage_dir:                       "/u01/stage"
 scripts_directory:               "{{ root_directory }}/app/scripts"
+create_database:                 false
 oracle_base:                     /u01/app/oracle
 oracle_home:                     /u01/app/oracle/product/19.3.0/db1
 oracle_inventory:                /u01/app/oraInventory 
@@ -11,12 +12,12 @@ root_user:                       root
 oradbsoft_rsp:                   "19cEE_SoftOnly"    
 oracle19c_path:                  "/data/software/Oracle/19c/LINUX.X64_193000_db_home.zip"
 dbca_rsp:                        "dbca"
-oracle_global_name:              "DOG.pattinson.org"
-oracle_unqname:                  "DOG"
-oracle_sid:                      "DOG"
-oracle_pdb_name:                 "DOGGY"
+oracle_global_name:              "SHED.pattinson.org"
+oracle_unqname:                  "SHED"
+oracle_sid:                      "SHED"
+oracle_pdb_name:                 "SHDPDB1"
 oracle_password:                 "Welcome123"
 oracle_datadir:                  "/u02/oradata"
 oracle_fra:                      "/u02/fast_recovery_area"
 profile_script:                  "setEnv.sh"
-oracle_memory_target:            "4G"
\ No newline at end of file
+oracle_memory_target:            "4G"