diff --git a/joomla-org/defaults/main.yml b/joomla-org/defaults/main.yml
index cbf36b5d..713076cc 100644
--- a/joomla-org/defaults/main.yml
+++ b/joomla-org/defaults/main.yml
@@ -2,7 +2,7 @@
 joomla_dist_name: Joomla
 joomla_major: 3
 joomla_minor: 8
-joomla_fix: 2
+joomla_fix: 5
 joomla_dist_version: '{{ joomla_major }}.{{ joomla_minor }}.{{ joomla_fix }}' 
 joomla_dist_file: '{{ joomla_dist_name }}_{{ joomla_dist_version }}-Stable-Full_Package.zip'
 joomla_download_version: '{{ joomla_major }}-{{ joomla_minor }}-{{ joomla_fix }}' 
@@ -12,14 +12,22 @@ joomla_download_dir: /srv/joomla
 joomla_install_dir: /var/www
 
 joomla_php_prereq:
-  - php5-json
-  - php5-intl
-  - php5-cli
-  - php5-pgsql
-  - php5-gd
-  - php5-memcached
+  - 'php{{ php_version }}-json'
+  - 'php{{ php_version }}-intl'
+  - 'php{{ php_version }}-cli'
+  - 'php{{ php_version }}-gd'
+  - 'php{{ php_version }}-memcached'
+  - 'php{{ php_version }}-zip'
+  - 'php{{ php_version }}-curl'
   - php-pear
   - php-date
   - php-xml-serializer
   - imagemagick
 
+joomla_use_postgresql: True 
+joomla_php_pg_driver:
+  - 'php{{ php_version }}-pgsql'
+
+joomla_use_mysql: False
+joomla_php_my_driver:
+  - 'php{{ php_version }}-mysqlnd'
diff --git a/joomla-org/tasks/main.yml b/joomla-org/tasks/main.yml
index 1a42478c..df388285 100644
--- a/joomla-org/tasks/main.yml
+++ b/joomla-org/tasks/main.yml
@@ -1,43 +1,48 @@
 ---
-- name: Install the joomla php prerequisites
-  apt: name={{ item }} state=present
-  with_items: '{{ joomla_php_prereq }}'
-  tags: joomla
+- block:
+  - name: Install the joomla php prerequisites
+    apt: name={{ item }} state=present
+    with_items: '{{ joomla_php_prereq }}'
 
-- name: Ensure that the download and install dirs exist
-  file: path={{ item }} state=directory
-  with_items:
-    - '{{ joomla_download_dir }}/joomla-unpacked'
-    - '{{ joomla_install_dir }}'
-  tags: joomla
-  
-- name: Download the joomla distribution file
-  get_url: url={{ joomla_tar_url }} dest={{ joomla_download_dir }} validate_certs=no
-  register: joomla_download
-  tags: joomla
+  - name: Install the php postgresql driver
+    apt: name={{ item }} state=present
+    with_items: '{{ joomla_php_pg_driver }}'
+    when: joomla_use_postgresql
 
-- name: Unpack the joomla distribution file
-  unarchive: copy=no src={{ joomla_download_dir }}/{{ joomla_dist_file }} dest={{ joomla_download_dir }}/joomla-unpacked
-  when: ( joomla_download | changed )
-  tags: joomla
+  - name: Install the php mysql driver
+    apt: name={{ item }} state=present
+    with_items: '{{ joomla_php_my_driver }}'
+    when: joomla_use_mysql
 
-- name: Move the joomla files to the right place
-  shell: cp -a {{ joomla_download_dir }}/joomla-unpacked/* {{ joomla_install_dir }}/
-  args:
-    creates: '{{ joomla_install_dir }}/index.php'
-  with_items: '{{ phpfpm_pools }}'
-  when: ( joomla_download | changed )
-  register: unpack_joomla
-  tags: joomla
+  - name: Ensure that the download and install dirs exist
+    file: path={{ item }} state=directory
+    with_items:
+      - '{{ joomla_download_dir }}/joomla-unpacked'
+      - '{{ joomla_install_dir }}'
+    
+  - name: Download the joomla distribution file
+    get_url: url={{ joomla_tar_url }} dest={{ joomla_download_dir }} validate_certs=no
+    register: joomla_download
 
-- name: Set the correct ownership of the joomla files
-  file: dest={{ joomla_install_dir }} owner={{ item.user }} group={{ item.group }} recurse=yes state=directory
-  with_items: '{{ phpfpm_pools }}'
-  when: ( unpack_joomla | changed )
-  tags: joomla
+  - name: Unpack the joomla distribution file
+    unarchive: copy=no src={{ joomla_download_dir }}/{{ joomla_dist_file }} dest={{ joomla_download_dir }}/joomla-unpacked
+    when: ( joomla_download | changed )
 
-- name: Remove the original joomla unpacked distribution
-  command: rm -fr {{ joomla_download_dir }}/{{ joomla_dist_name }}
-  when: ( unpack_joomla | changed )
-  tags: joomla
+  - name: Move the joomla files to the right place
+    shell: cp -a {{ joomla_download_dir }}/joomla-unpacked/* {{ joomla_install_dir }}/
+    args:
+      creates: '{{ joomla_install_dir }}/index.php'
+    with_items: '{{ phpfpm_pools }}'
+    when: ( joomla_download | changed )
+    register: unpack_joomla
 
+  - name: Set the correct ownership of the joomla files
+    file: dest={{ joomla_install_dir }} owner={{ item.user }} group={{ item.group }} recurse=yes state=directory
+    with_items: '{{ phpfpm_pools }}'
+    when: ( unpack_joomla | changed )
+
+  - name: Remove the original joomla unpacked distribution
+    command: rm -fr {{ joomla_download_dir }}/{{ joomla_dist_name }}
+    when: ( unpack_joomla | changed )
+
+  tags: joomla