diff --git a/playbooks/oracle_password_rotation/all_password_rotation/tasks/non_oem_database_passwords.yml b/playbooks/oracle_password_rotation/all_password_rotation/tasks/non_oem_database_passwords.yml
index 7d3b33a3..4e9b9807 100644
--- a/playbooks/oracle_password_rotation/all_password_rotation/tasks/non_oem_database_passwords.yml
+++ b/playbooks/oracle_password_rotation/all_password_rotation/tasks/non_oem_database_passwords.yml
@@ -1,7 +1,6 @@
 - name: Clean Up Broken or Missing Data Guard Wallets
   when: unlock_system_passwords is not defined
   block:
-  
     - name: Set up oracle database home
       shell: |
         . ~/.bash_profile
@@ -247,7 +246,7 @@
 
     - name: Rotate Oracle Password
       include_tasks: rotate_oracle_password.yml
-        
+
   # Restart Monitoring regardless of success of password rotation
   always:
     - name: Re-Enable Monitoring
diff --git a/playbooks/oracle_password_rotation/all_password_rotation/tasks/oem_database_passwords.yml b/playbooks/oracle_password_rotation/all_password_rotation/tasks/oem_database_passwords.yml
index f9e3afca..64a2329c 100644
--- a/playbooks/oracle_password_rotation/all_password_rotation/tasks/oem_database_passwords.yml
+++ b/playbooks/oracle_password_rotation/all_password_rotation/tasks/oem_database_passwords.yml
@@ -97,4 +97,4 @@
   with_nested:
     - ["sys", "system", "dbsnmp"]
     - ["{{ db_configs['RCVCAT']['rcvcat_db_name'] }}", "{{ db_configs['EMREP']['emrepo_db_name'] }}"]
-  when: unlock_system_passwords is defined
\ No newline at end of file
+  when: unlock_system_passwords is defined
diff --git a/playbooks/oracle_password_rotation/database_password_rotation.yml b/playbooks/oracle_password_rotation/database_password_rotation.yml
index e14faebe..8531a815 100644
--- a/playbooks/oracle_password_rotation/database_password_rotation.yml
+++ b/playbooks/oracle_password_rotation/database_password_rotation.yml
@@ -4,7 +4,4 @@
   become: yes
   become_user: oracle
   roles:
-    - {
-        role: all_password_rotation,
-        when: ( environment_name is defined )
-      }
+    - { role: all_password_rotation, when: ( environment_name is defined ) }
diff --git a/playbooks/oracle_password_rotation/oem_password_rotation.yml b/playbooks/oracle_password_rotation/oem_password_rotation.yml
index 1d5bdefa..28518de4 100644
--- a/playbooks/oracle_password_rotation/oem_password_rotation.yml
+++ b/playbooks/oracle_password_rotation/oem_password_rotation.yml
@@ -4,4 +4,4 @@
   become: yes
   become_user: oracle
   roles:
-    - { role: oem_password_rotation, when: environment_name is search('hmpps-oem') }
+    - { role: oem_password_rotation, when: environment_name is defined }