diff --git a/tasks/main.yml b/tasks/main.yml
index 735c961..5610c30 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,15 +1,19 @@
 ---
 # tasks file for apigee-opdk-setup-postgres-config
-- name: Set permissions on pgdata folder
-  file:
-    path: '{{ apigee_postgresql_data_dir }}'
-    owner: '{{ opdk_user_name }}'
-    group: '{{ opdk_group_name }}'
-    mode: 0700
-    state: directory
+- block:
 
-- name: Remove pgdata folder for 4.16.09
-  file:
-    path: '{{ apigee_postgresql_data_dir }}'
-    state: absent
-  when: clear_pgdata | default(False)
+  - name: Set permissions on pgdata folder
+    file:
+      path: '{{ apigee_postgresql_data_dir }}'
+      owner: '{{ opdk_user_name }}'
+      group: '{{ opdk_group_name }}'
+      mode: 0700
+      state: directory
+
+  - name: Remove pgdata folder for 4.16.09
+    file:
+      path: '{{ apigee_postgresql_data_dir }}'
+      state: absent
+    when: clear_pgdata | default(False)
+
+  become: true