diff --git a/joomla-org/defaults/main.yml b/joomla-org/defaults/main.yml
index aaf98f28..cbf36b5d 100644
--- a/joomla-org/defaults/main.yml
+++ b/joomla-org/defaults/main.yml
@@ -1,8 +1,13 @@
 ---
 joomla_dist_name: Joomla
-joomla_dist_version: 3.4.8
+joomla_major: 3
+joomla_minor: 8
+joomla_fix: 2
+joomla_dist_version: '{{ joomla_major }}.{{ joomla_minor }}.{{ joomla_fix }}' 
 joomla_dist_file: '{{ joomla_dist_name }}_{{ joomla_dist_version }}-Stable-Full_Package.zip'
-joomla_tar_url: 'https://github.com/joomla/joomla-cms/releases/download/{{ joomla_dist_version }}/{{ joomla_dist_file }}'
+joomla_download_version: '{{ joomla_major }}-{{ joomla_minor }}-{{ joomla_fix }}' 
+joomla_download_file: '{{ joomla_dist_name }}_{{ joomla_dist_version }}-Stable-Full_Package.zip'
+joomla_tar_url: 'https://downloads.joomla.org/cms/joomla{{ joomla_major }}/{{ joomla_download_version }}/{{ joomla_download_file }}?format=zip'
 joomla_download_dir: /srv/joomla
 joomla_install_dir: /var/www
 
diff --git a/joomla-org/tasks/main.yml b/joomla-org/tasks/main.yml
index 03cecb4d..1a42478c 100644
--- a/joomla-org/tasks/main.yml
+++ b/joomla-org/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Install the joomla php prerequisites
   apt: name={{ item }} state=present
-  with_items: joomla_php_prereq
+  with_items: '{{ joomla_php_prereq }}'
   tags: joomla
 
 - name: Ensure that the download and install dirs exist
@@ -12,7 +12,7 @@
   tags: joomla
   
 - name: Download the joomla distribution file
-  get_url: url={{ joomla_tar_url }} dest={{ joomla_download_dir }}
+  get_url: url={{ joomla_tar_url }} dest={{ joomla_download_dir }} validate_certs=no
   register: joomla_download
   tags: joomla
 
@@ -25,14 +25,14 @@
   shell: cp -a {{ joomla_download_dir }}/joomla-unpacked/* {{ joomla_install_dir }}/
   args:
     creates: '{{ joomla_install_dir }}/index.php'
-  with_items: phpfpm_pools
+  with_items: '{{ phpfpm_pools }}'
   when: ( joomla_download | changed )
   register: unpack_joomla
   tags: 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
+  with_items: '{{ phpfpm_pools }}'
   when: ( unpack_joomla | changed )
   tags: joomla