diff --git a/roles/apps/tasks/configure_app.yml b/roles/apps/tasks/configure_app.yml
index e0fcefa..f91c788 100644
--- a/roles/apps/tasks/configure_app.yml
+++ b/roles/apps/tasks/configure_app.yml
@@ -1,7 +1,7 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
-- name: Create app folder for {{ app_name }}
+- name: Create app directory for {{ app_name }}
   ansible.builtin.file:
     path: "{{ apps_data_root }}/{{ app_name }}"
     owner: root
@@ -15,7 +15,7 @@
     owner: root
     mode: u=rw,go=
 
-- name: Create data folder for {{ app_name }}
+- name: Create data directory for {{ app_name }}
   ansible.builtin.file:
     path: "{{ apps_data_root }}/{{ app_name }}/data"
     owner: root
diff --git a/roles/apps/tasks/extra_tasks/ipfs.yml b/roles/apps/tasks/extra_tasks/ipfs.yml
index 884a8d6..1becbe0 100644
--- a/roles/apps/tasks/extra_tasks/ipfs.yml
+++ b/roles/apps/tasks/extra_tasks/ipfs.yml
@@ -1,7 +1,7 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
-- name: Create subfolders for IPFS data
+- name: Create subdirectories for IPFS data
   ansible.builtin.file:
     path: "{{ dir }}"
     owner: root
diff --git a/roles/apps/tasks/extra_tasks/monerod.yml b/roles/apps/tasks/extra_tasks/monerod.yml
index 2e4362b..420c926 100644
--- a/roles/apps/tasks/extra_tasks/monerod.yml
+++ b/roles/apps/tasks/extra_tasks/monerod.yml
@@ -1,7 +1,7 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
-- name: Create subfolder for monerod data
+- name: Create subdirectory for monerod data
   ansible.builtin.file:
     path: "{{ apps_data_root }}/monerod/data/bitmonero"
     owner: '1000'
diff --git a/roles/apps/tasks/extra_tasks/nextcloud.yml b/roles/apps/tasks/extra_tasks/nextcloud.yml
index da7a647..ba88c4c 100644
--- a/roles/apps/tasks/extra_tasks/nextcloud.yml
+++ b/roles/apps/tasks/extra_tasks/nextcloud.yml
@@ -1,14 +1,14 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
-- name: Create subfolder for Nextcloud Apache2 config
+- name: Create subdirectory for Nextcloud Apache2 config
   ansible.builtin.file:
     path: "{{ apps_data_root }}/nextcloud/data/apache2"
     owner: root
     mode: u=rwx,g=rx,o=rx
     state: directory
 
-- name: Create subfolder for Nextcloud data
+- name: Create subdirectory for Nextcloud data
   ansible.builtin.file:
     path: "{{ apps_data_root }}/nextcloud/data/app"
     owner: root
diff --git a/roles/apps/tasks/extra_tasks/nginx.yml b/roles/apps/tasks/extra_tasks/nginx.yml
index 4c708fa..6d36e58 100644
--- a/roles/apps/tasks/extra_tasks/nginx.yml
+++ b/roles/apps/tasks/extra_tasks/nginx.yml
@@ -1,7 +1,7 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
-- name: Create subfolder for nginx config files
+- name: Create subdirectory for nginx config files
   ansible.builtin.file:
     path: "{{ apps_data_root }}/nginx/data/conf.d"
     owner: root
diff --git a/roles/apps/tasks/main.yml b/roles/apps/tasks/main.yml
index cca8156..4a4bb95 100644
--- a/roles/apps/tasks/main.yml
+++ b/roles/apps/tasks/main.yml
@@ -16,7 +16,7 @@
     state: present
   when: "'postfix' in apps_include"
 
-- name: Create base folder for apps
+- name: Create base directory for apps
   ansible.builtin.file:
     path: "{{ apps_data_root }}"
     owner: root
diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml
index 8bdfa35..9dc3683 100644
--- a/roles/postgresql/tasks/main.yml
+++ b/roles/postgresql/tasks/main.yml
@@ -24,7 +24,7 @@
     update_cache: true
     state: present
 
-- name: Create PostgreSQL service override folder
+- name: Create PostgreSQL service override directory
   ansible.builtin.file:
     path: /etc/systemd/system/{{ postgresql_service }}.service.d
     owner: root
@@ -42,13 +42,20 @@
 - name: Flush handlers
   ansible.builtin.meta: flush_handlers
 
-- name: Create PGDATA folder
+- name: Create PGDATA directory
   ansible.builtin.file:
     path: "{{ postgresql_pgdata }}"
     owner: postgres
     mode: u=rwx,go=
     state: directory
 
+- name: Create WAL archive directory
+  ansible.builtin.file:
+    path: "{{ postgresql_wal_archive }}"
+    owner: postgres
+    mode: u=rwx,go=
+    state: directory
+
 - name: Initialize database
   ansible.builtin.command:
     cmd: /usr/pgsql-{{ postgresql_version }}/bin/postgresql-{{ postgresql_version }}-setup initdb
diff --git a/roles/proxy/tasks/main.yml b/roles/proxy/tasks/main.yml
index 5588dae..5e34fdd 100644
--- a/roles/proxy/tasks/main.yml
+++ b/roles/proxy/tasks/main.yml
@@ -1,14 +1,14 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
-- name: Create base folder for Caddy
+- name: Create base directory for Caddy
   ansible.builtin.file:
     path: "{{ proxy_data_root }}"
     owner: root
     mode: u=rwx,g=rx,o=rx
     state: directory
 
-- name: Create build folder for Caddy
+- name: Create build directory for Caddy
   ansible.builtin.file:
     path: "{{ proxy_data_root }}/build"
     owner: root
@@ -30,7 +30,7 @@
     mode: u=rw,g=r,o=r
   notify: Build custom Docker image for Caddy
 
-- name: Create data folder for Caddy
+- name: Create data directory for Caddy
   ansible.builtin.file:
     path: "{{ proxy_data_root }}/data"
     owner: root
@@ -44,7 +44,7 @@
     owner: root
     mode: u=rw,go=
 
-- name: Create subfolders for Caddy data
+- name: Create subdirectories for Caddy data
   ansible.builtin.file:
     path: "{{ proxy_data_root }}/data/caddy-{{ item }}"
     owner: root