diff --git a/tasks/main.yml b/tasks/main.yml
index b3aa5ec..11481d4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,32 +10,33 @@
     key: 'java_home'
     value: '{{ java_home }}'
 
-- name: Remove old JAVA_HOME
-  lineinfile:
-    create: yes
-    dest: "{{ apigee_home }}/etc/defaults.sh"
-    regexp: "{{ item }}"
-    state: absent
-    backup: yes
-    owner: "{{ opdk_user_name }}"
-    group: "{{ opdk_group_name }}"
-  with_items:
-  - "^JAVA_HOME="
-  - "^export JAVA_HOME"
-  - "^PATH=\\$JAVA_HOME/bin"
+- block:
+  - name: Remove old JAVA_HOME
+    lineinfile:
+      create: yes
+      dest: "{{ apigee_home }}/etc/defaults.sh"
+      regexp: "{{ item }}"
+      state: absent
+      backup: yes
+      owner: "{{ opdk_user_name }}"
+      group: "{{ opdk_group_name }}"
+    with_items:
+    - "^JAVA_HOME="
+    - "^export JAVA_HOME"
+    - "^PATH=\\$JAVA_HOME/bin"
 
-- name: Update default.sh with JAVA_HOME
-  lineinfile:
-    create: yes
-    dest: "{{ apigee_home }}/etc/defaults.sh"
-    regexp: "{{ item.regexp }}"
-    line: '{{ item.line }}'
-    backup: yes
-    state: present
-    owner: "{{ opdk_user_name }}"
-    group: "{{ opdk_group_name }}"
-  with_items:
-  - { regexp: "^JAVA_HOME=", line: "JAVA_HOME={{ java_home }}" }
-  - { regexp: "^PATH=\\$JAVA_HOME/bin:\\$PATH", line: "PATH=$JAVA_HOME/bin:$PATH"}
-  - { regexp: "^export JAVA_HOME", line: "export JAVA_HOME"}
-
+  - name: Update default.sh with JAVA_HOME
+    lineinfile:
+      create: yes
+      dest: "{{ apigee_home }}/etc/defaults.sh"
+      regexp: "{{ item.regexp }}"
+      line: '{{ item.line }}'
+      backup: yes
+      state: present
+      owner: "{{ opdk_user_name }}"
+      group: "{{ opdk_group_name }}"
+    with_items:
+    - { regexp: "^JAVA_HOME=", line: "JAVA_HOME={{ java_home }}" }
+    - { regexp: "^PATH=\\$JAVA_HOME/bin:\\$PATH", line: "PATH=$JAVA_HOME/bin:$PATH"}
+    - { regexp: "^export JAVA_HOME", line: "export JAVA_HOME"}
+  become: yes