diff --git a/drupal-org/defaults/main.yml b/drupal-org/defaults/main.yml
index 4ca5653..5ef0934 100644
--- a/drupal-org/defaults/main.yml
+++ b/drupal-org/defaults/main.yml
@@ -1,6 +1,8 @@
 ---
 drupal_install_deb: False
-drupal_dist_name: drupal-8.0.0-rc1
+drupal_major: 8
+drupal_version: '{{ drupal_major_ver }}.0.3'
+drupal_dist_name: 'drupal-{{ drupal_version }}'
 drupal_dist_file: '{{ drupal_dist_name }}.tar.gz'
 drupal_tar_url: 'http://ftp.drupal.org/files/projects/{{ drupal_dist_file }}'
 drupal_download_dir: /srv/drupal
diff --git a/drupal-org/tasks/main.yml b/drupal-org/tasks/main.yml
index 9f8c8be..af186a1 100644
--- a/drupal-org/tasks/main.yml
+++ b/drupal-org/tasks/main.yml
@@ -37,23 +37,27 @@
   tags: drupal
 
 - name: Create the default settings file
-  command: cp {{ drupal_install_dir }}/{{ item.virthost }}sites/default/default.settings.php {{ drupal_install_dir }}/{{ item.virthost }}sites/default/settings.php
+  command: cp {{ drupal_install_dir }}/{{ item.virthost }}/sites/default/default.settings.php {{ drupal_install_dir }}/{{ item.virthost }}sites/default/settings.php
   args:
-    creates: '{{ drupal_install_dir }}/{{ item.virthost }}sites/default/settings.php'
+    creates: '{{ drupal_install_dir }}/{{ item.virthost }}/sites/default/settings.php'
   with_items: phpfpm_pools
-  when: ( unpack_drupal | changed )
+  when:
+    - ( unpack_drupal | changed )
+    - '{{ drupal_major_ver }} >= 8'
   tags: drupal
 
 - name: Create the default services file
-  command: cp {{ drupal_install_dir }}/{{ item.virthost }}sites/default/default.services.yml {{ drupal_install_dir }}/{{ item.virthost }}sites/default/services.yml
+  command: cp {{ drupal_install_dir }}/{{ item.virthost }}/sites/default/default.services.yml {{ drupal_install_dir }}/{{ item.virthost }}sites/default/services.yml
   args:
-    creates: '{{ drupal_install_dir }}/{{ item.virthost }}sites/default/services.yml'
+    creates: '{{ drupal_install_dir }}/{{ item.virthost }}/sites/default/services.yml'
   with_items: phpfpm_pools
-  when: ( unpack_drupal | changed )
+  when:
+    - ( unpack_drupal | changed )
+    - '{{ drupal_major_ver }} >= 8'
   tags: drupal
 
 - name: Create the files directory
-  file: path={{ drupal_install_dir }}/{{ item.virthost }}sites/default/files owner={{ item.user }} group={{ item.group }} mode=0770
+  file: dest={{ drupal_install_dir }}/{{ item.virthost }}/sites/default/files owner={{ item.user }} group={{ item.group }} mode=0770 state=directory
   with_items: phpfpm_pools
   when: ( unpack_drupal | changed )
   tags: drupal