diff --git a/solr/tasks/main.yml b/solr/tasks/main.yml
index 8822466..989aa94 100644
--- a/solr/tasks/main.yml
+++ b/solr/tasks/main.yml
@@ -7,16 +7,19 @@
 
     - name: Create the solr service and download directories
       file: path={{ item }} state=directory
-      with_items: [ '{{ solr_data_dir }}', '{{ solr_download_dir }}' ]
+      with_items: [ '{{ solr_download_dir }}' ]
 
     - name: Download solr
       get_url: url='{{ solr_download_url }}' dest={{ solr_download_dir }}/solr-{{ solr_version }}.tgz validate_certs=no
 
     - name: Unarchive solr release
-      unarchive: src={{ solr_download_dir }}/solr-{{ solr_version }}.tgz dest={{ solr_data_dir }}
+      unarchive: src={{ solr_download_dir }}/solr-{{ solr_version }}.tgz dest={{ solr_base_dir }} copy=no
 
+    - name: Link to the latest release
+      file: src=solr-{{ solr_version }} dest={{ solr_data_dir }} state=link
+      
     - name: create solr lib dir
-      file: path={{ solr_data_dir }}/server/solr/lib
+      file: path={{ solr_data_dir }}/server/solr/lib state=directory
 
     - name: copy extra libraries
       shell: cd {{ solr_data_dir }}; cp -u {{ item }} {{ solr_data_dir }}/server/solr/lib