diff --git a/delete-db.yml b/delete-db.yml
index dd0ad6e79..6ae7dd7b7 100755
--- a/delete-db.yml
+++ b/delete-db.yml
@@ -4,9 +4,9 @@
 
  - name: Delete Database(s)
    hosts: "{{ hostgroup }}"
-   user: ansible
-   sudo: yes
-   sudo_user: oracle
+   #user: ansible
+   become: yes
+   become_user: oracle
    roles:
       - oradb-delete
 
diff --git a/full-rac-flex-install.yml b/full-rac-flex-install.yml
index 519b8d266..f947bc958 100644
--- a/full-rac-flex-install.yml
+++ b/full-rac-flex-install.yml
@@ -2,7 +2,7 @@
  - name: Host configuration
    hosts: orarac-flex
    user: ansible
-   sudo: yes
+   become: yes
    roles:
       - common
       - orahost
@@ -10,21 +10,21 @@
  - name: Storage Configuration 
    hosts: orarac-flex-hub
    user: ansible
-   sudo: yes
+   become: yes
    roles:
       - orahost-storage
 
  - name: Oracle Grid Infrastructure installation
    hosts: orarac-flex
    user: ansible
-   sudo: yes
+   become: yes
    roles:
       - oraswgi-install
 
  - name: ASM Configuration, Database Server Installation & Database Creation
    hosts: orarac-flex-hub
    user: ansible
-   sudo: yes
+   become: yes
    roles:
       - oraasm-createdg
       - oraswdb-install
diff --git a/gi-opatch.yml b/gi-opatch.yml
index 76d9334ad..8791b16ee 100755
--- a/gi-opatch.yml
+++ b/gi-opatch.yml
@@ -3,9 +3,7 @@
 
 
  - name: Apply latest PSU to GI
-   hosts: orarac-dc2
-   user: ansible
-   sudo: yes
+   hosts: "{{ hostgroup }}"
+   become: yes
    roles:
       - oraswgi-opatch
-
diff --git a/inventory/ec2 b/inventory/ec2
deleted file mode 100644
index 05a7e98be..000000000
--- a/inventory/ec2
+++ /dev/null
@@ -1,2 +0,0 @@
-[aws-si-asm]
-localhost