diff --git a/tasks/main.yml b/tasks/main.yml
index bbfb4ed..eeb34cf 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,14 +2,14 @@
 - name: Install the solr schema used by CKAN
   file: src=/usr/lib/ckan/default/src/ckan/ckan/config/solr/schema.xml dest={{ solr_collections_base_dir }}/{{ item }}/conf/schema.xml state=link force=yes
   with_items: '{{ solr_cores }}'
-  when: not ckan_geonetwork_harvester
+  when: not ckan_geonetwork_harvester and solr_version is version_compare('9.0.0', '<=')
   notify: Solr Restart
   tags: [ 'ckan', 'solr', 'solr_schema', 'solr_core' ]
 
 - name: Install the solr schema used by CKAN, modified with the spatial fields
   copy: src=schema.xml dest={{ solr_collections_base_dir }}/{{ item }}/conf/schema.xml force=yes
   with_items: '{{ solr_cores }}'
-  when: ckan_geonetwork_harvester
+  when: ckan_geonetwork_harvester and solr_version is version_compare('9.0.0', '<=')
   notify: Solr Restart
   tags: [ 'ckan', 'solr', 'solr_schema', 'solr_core' ]
 
@@ -28,4 +28,5 @@
     owner: "root"
     group: "root"
   notify: Solr restart
-  tags: [ 'solr', 'solr_default', 'solr_schema', 'solr_jts' ]
\ No newline at end of file
+  tags: [ 'solr', 'solr_default', 'solr_schema', 'solr_jts' ]
+  when: solr_version is version_compare('9.7.0', '>=')
\ No newline at end of file