diff --git a/roles/ckan/defaults/main.yml b/roles/ckan/defaults/main.yml
index 793c71f..21ba9bd 100644
--- a/roles/ckan/defaults/main.yml
+++ b/roles/ckan/defaults/main.yml
@@ -38,6 +38,7 @@ ckanext_scheming_version: release-2.1.0
 # whereas the branch parameter is used for updating the code. They are separate parameters
 # so that we can reference a specific commit in the code base while still getting
 # the correct Solr schema. They would usually be the same, however.
-ckan_msl_core_plugin_version: 1.3.0
-ckan_msl_core_plugin_branch: 1.3.0
+ckan_msl_core_plugin_version: 1.4.0
+ckan_msl_core_plugin_branch: 1.4.0
 ckan_msl_util_plugin_branch: 1.0.0
+ckan_msl_vocabularies_endpoint: https://epos-msl.ckan.test/webservice/api/vocabularies
diff --git a/roles/ckan/tasks/main.yml b/roles/ckan/tasks/main.yml
index 3bf643b..6ba44b5 100644
--- a/roles/ckan/tasks/main.yml
+++ b/roles/ckan/tasks/main.yml
@@ -142,20 +142,21 @@
 
 
 - name: Ensure default schema has been backed up
-  ansible.builtin.command: "mv /etc/solr/conf/schema.xml /etc/solr/conf/schema.xml.orig"
+  ansible.builtin.command:
+    cmd: "mv /etc/solr/conf/schema.xml /etc/solr/conf/schema.xml.orig"
+    creates: /etc/solr/conf/schema.xml.orig
   when: solrschema.stat.exists and solrschema.stat.isreg is defined and solrschema.stat.isreg
 
 
 - name: Use custom Solr scheme for EPOS-MSL
   become_user: root
   become: true
-  ansible.builtin.template:
-    src: solrschema.xml.j2
+  ansible.posix.synchronize:
+    src: /usr/lib/ckan/msl_ckan_core/ckanext/msl_ckan/config/solr/schema.xml
     dest: /etc/solr/conf/schema.xml
-    owner: root
-    group: root
-    mode: "0644"
   notify: Restart Solr
+  delegate_to: "{{ inventory_hostname }}"
+  when: not ansible_check_mode
 
 
 - name: Check who.ini
diff --git a/roles/ckan/templates/ckan.ini.j2 b/roles/ckan/templates/ckan.ini.j2
index f2d5570..d11c02a 100644
--- a/roles/ckan/templates/ckan.ini.j2
+++ b/roles/ckan/templates/ckan.ini.j2
@@ -131,6 +131,8 @@ mslfacets.dataset_config = ckanext.msl_ckan:config/facets.json
 
 mslindexfields.field_config = ckanext.msl_ckan:config/msl_index_fields.json
 
+mslvocabularies.endpoint_root = {{ ckan_msl_vocabularies_endpoint }}
+
 # Define which views should be created by default
 # (plugins must be loaded in ckan.plugins)
 ckan.views.default_views = image_view text_view recline_view
diff --git a/roles/ckan/templates/solrschema.xml.j2 b/roles/ckan/templates/solrschema.xml.j2
deleted file mode 100644
index 00fcecd..0000000
--- a/roles/ckan/templates/solrschema.xml.j2
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
-     NB Please copy changes to this file into the multilingual schema:
-        ckanext/multilingual/solr/schema.xml
--->
-
-<!-- We update the version when there is a backward-incompatible change to this
-schema. In this case the version should be set to the next CKAN version number.
-(x.y but not x.y.z since it needs to be a float) -->
-<schema name="ckan" version="2.9">
-
-<types>
-    <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
-    <fieldtype name="binary" class="solr.BinaryField"/>
-    <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="date" class="solr.TrieDateField" omitNorms="true" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true" precisionStep="6" positionIncrementGap="0"/>
-
-    <fieldType name="tdates" class="solr.TrieDateField" precisionStep="7" positionIncrementGap="0" multiValued="true"/>
-    <fieldType name="booleans" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
-    <fieldType name="tints" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
-    <fieldType name="tfloats" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
-    <fieldType name="tlongs" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
-    <fieldType name="tdoubles" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
-
-    <fieldType name="text" class="solr.TextField" positionIncrementGap="100">
-        <analyzer type="index">
-            <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-            <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
-            <filter class="solr.LowerCaseFilterFactory"/>
-            <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
-            <filter class="solr.ASCIIFoldingFilterFactory"/>
-        </analyzer>
-        <analyzer type="query">
-            <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-            <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-            <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
-            <filter class="solr.LowerCaseFilterFactory"/>
-            <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
-            <filter class="solr.ASCIIFoldingFilterFactory"/>
-        </analyzer>
-    </fieldType>
-
-
-    <!-- A general unstemmed text field - good if one does not know the language of the field -->
-    <fieldType name="textgen" class="solr.TextField" positionIncrementGap="100">
-        <analyzer type="index">
-            <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-            <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="0"/>
-            <filter class="solr.LowerCaseFilterFactory"/>
-        </analyzer>
-        <analyzer type="query">
-            <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-            <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-            <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0"/>
-            <filter class="solr.LowerCaseFilterFactory"/>
-        </analyzer>
-    </fieldType>
-
-    <fieldType name="text_ngram" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.NGramTokenizerFactory" minGramSize="2" maxGramSize="10"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-</types>
-
-
-<fields>
-    <field name="index_id" type="string" indexed="true" stored="true" required="true" />
-    <field name="id" type="string" indexed="true" stored="true" required="true" />
-    <field name="site_id" type="string" indexed="true" stored="true" required="true" />
-    <field name="title" type="text" indexed="true" stored="true" />
-    <field name="title_ngram" type="text_ngram" indexed="true" stored="true" />
-    <field name="entity_type" type="string" indexed="true" stored="true" omitNorms="true" />
-    <field name="dataset_type" type="string" indexed="true" stored="true" />
-    <field name="state" type="string" indexed="true" stored="true" omitNorms="true" />
-    <field name="name" type="string" indexed="true" stored="true" omitNorms="true" />
-    <field name="name_ngram" type="text_ngram" indexed="true" stored="true" />
-    <field name="revision_id" type="string" indexed="true" stored="true" omitNorms="true" />
-    <field name="version" type="string" indexed="true" stored="true" />
-    <field name="url" type="string" indexed="true" stored="true" omitNorms="true" />
-    <field name="ckan_url" type="string" indexed="true" stored="true" omitNorms="true" />
-    <field name="download_url" type="string" indexed="true" stored="true" omitNorms="true" />
-    <field name="notes" type="text" indexed="true" stored="true"/>
-    <field name="author" type="textgen" indexed="true" stored="true" />
-    <field name="author_email" type="textgen" indexed="true" stored="true" />
-    <field name="maintainer" type="textgen" indexed="true" stored="true" />
-    <field name="maintainer_email" type="textgen" indexed="true" stored="true" />
-    <field name="license" type="string" indexed="true" stored="true" />
-    <field name="license_id" type="string" indexed="true" stored="true" />
-    <field name="ratings_count" type="int" indexed="true" stored="false" />
-    <field name="ratings_average" type="float" indexed="true" stored="false" />
-    <field name="tags" type="string" indexed="true" stored="true" multiValued="true"/>
-    <field name="groups" type="string" indexed="true" stored="true" multiValued="true"/>
-    <field name="organization" type="string" indexed="true" stored="true" multiValued="false"/>
-
-    <field name="capacity" type="string" indexed="true" stored="true" multiValued="false"/>
-    <field name="permission_labels" type="string" indexed="true" stored="false" multiValued="true"/>
-
-    <field name="res_name" type="textgen" indexed="true" stored="true" multiValued="true" />
-    <field name="res_description" type="textgen" indexed="true" stored="true" multiValued="true"/>
-    <field name="res_format" type="string" indexed="true" stored="true" multiValued="true"/>
-    <field name="res_url" type="string" indexed="true" stored="true" multiValued="true"/>
-    <field name="res_type" type="string" indexed="true" stored="true" multiValued="true"/>
-
-    <!-- catchall field, containing all other searchable text fields (implemented
-         via copyField further on in this schema  -->
-    <field name="text" type="text" indexed="true" stored="false" multiValued="true"/>
-    <field name="urls" type="text" indexed="true" stored="false" multiValued="true"/>
-
-    <field name="depends_on" type="text" indexed="true" stored="false" multiValued="true"/>
-    <field name="dependency_of" type="text" indexed="true" stored="false" multiValued="true"/>
-    <field name="derives_from" type="text" indexed="true" stored="false" multiValued="true"/>
-    <field name="has_derivation" type="text" indexed="true" stored="false" multiValued="true"/>
-    <field name="links_to" type="text" indexed="true" stored="false" multiValued="true"/>
-    <field name="linked_from" type="text" indexed="true" stored="false" multiValued="true"/>
-    <field name="child_of" type="text" indexed="true" stored="false" multiValued="true"/>
-    <field name="parent_of" type="text" indexed="true" stored="false" multiValued="true"/>
-    <field name="views_total" type="int" indexed="true" stored="false"/>
-    <field name="views_recent" type="int" indexed="true" stored="false"/>
-    <field name="resources_accessed_total" type="int" indexed="true" stored="false"/>
-    <field name="resources_accessed_recent" type="int" indexed="true" stored="false"/>
-
-    <field name="metadata_created" type="date" indexed="true" stored="true" multiValued="false"/>
-    <field name="metadata_modified" type="date" indexed="true" stored="true" multiValued="false"/>
-
-    <field name="indexed_ts" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
-
-    <!-- Copy the title field into titleString, and treat as a string
-         (rather than text type).  This allows us to sort on the titleString -->
-    <field name="title_string" type="string" indexed="true" stored="false" />
-
-    <field name="data_dict" type="string" indexed="false" stored="true" />
-    <field name="validated_data_dict" type="string" indexed="false" stored="true" />
-
-    <field name="_version_" type="string" indexed="true" stored="true"/>
-
-    <dynamicField name="*_date" type="date" indexed="true" stored="true" multiValued="false"/>
-
-    <dynamicField name="extras_*" type="text" indexed="true" stored="true" multiValued="false"/>
-    <dynamicField name="res_extras_*" type="text" indexed="true" stored="true" multiValued="true"/>
-    <dynamicField name="vocab_*" type="string" indexed="true" stored="true" multiValued="true"/>
-    <dynamicField name="*" type="string" indexed="true"  stored="false"/>
-
-<!-- MSL custom fields for indexing and web services -->
-<field name="msl_hidden_text" type="text" indexed="true" stored="false" multiValued="true"/>
-
-<!-- coming from IPackageController msl_search.MslIndexRepeatedFieldsPlugin::before(index) -->
-<field name="msl_author_name" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_author_name_text" type="text" indexed="true" stored="false" multiValued="true"/>	
-<field name="msl_lab_name" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_lab_name_text" type="text" indexed="true" stored="false" multiValued="true"/>			
-<field name="msl_subdomain" type="string" indexed="true" stored="true" multiValued="true"/>	
-<field name="msl_download_link" type="string" indexed="true" stored="true" multiValued="true"/>
-
-<!-- Materials -->
-<field name="msl_material_1" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_material_2" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_material_3" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_material_4" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_material_5" type="string" indexed="true" stored="true" multiValued="true"/>	
-<field name="msl_has_material" type="string" indexed="true" stored="false" />
-
-<field name="msl_material_1_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_material_2_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_material_3_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_material_4_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_material_5_original" type="string" indexed="true" stored="true" multiValued="true"/>	
-<field name="msl_has_material_original" type="string" indexed="true" stored="false" />
-
-<!-- Porefluids -->
-<field name="msl_porefluid_1" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_porefluid_2" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_porefluid_3" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_porefluid" type="string" indexed="true" stored="false" />	
-
-<field name="msl_porefluid_1_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_porefluid_2_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_porefluid_3_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_porefluid_original" type="string" indexed="true" stored="false" />	
-
-<!-- Rock physics -->
-<field name="msl_rockphysic_1" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_rockphysic_2" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_rockphysic_3" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_rockphysic_4" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_rockphysic_5" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_rockphysic" type="string" indexed="true" stored="false" />
-
-<field name="msl_rockphysic_1_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_rockphysic_2_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_rockphysic_3_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_rockphysic_4_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_rockphysic_5_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_rockphysic_original" type="string" indexed="true" stored="false" />	
-
-<!-- Analogue modelling -->
-<field name="msl_analogue_1" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_analogue_2" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_analogue_3" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_analogue_4" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_analogue_5" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_analogue" type="string" indexed="true" stored="false" />
-
-<field name="msl_analogue_1_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_analogue_2_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_analogue_3_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_analogue_4_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_analogue_5_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_analogue_original" type="string" indexed="true" stored="false" />
-
-<!-- Geological age -->
-<field name="msl_geologicalage_1" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalage_2" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalage_3" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalage_4" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalage_5" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalage_6" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_geologicalage" type="string" indexed="true" stored="false" />
-
-<field name="msl_geologicalage_1_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalage_2_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalage_3_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalage_4_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalage_5_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalage_6_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_geologicalage_original" type="string" indexed="true" stored="false" />
-
-<!-- Geological setting -->
-<field name="msl_geologicalsetting_1" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalsetting_2" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalsetting_3" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalsetting_4" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_geologicalsetting" type="string" indexed="true" stored="false" />
-
-<field name="msl_geologicalsetting_1_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalsetting_2_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalsetting_3_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geologicalsetting_4_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_geologicalsetting_original" type="string" indexed="true" stored="false" />
-
-<!-- Paleomagnetism -->
-<field name="msl_paleomagnetism_1" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_paleomagnetism_2" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_paleomagnetism_3" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_paleomagnetism_4" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_paleomagnetism_5" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_paleomagnetism" type="string" indexed="true" stored="false" />
-
-<field name="msl_paleomagnetism_1_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_paleomagnetism_2_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_paleomagnetism_3_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_paleomagnetism_4_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_paleomagnetism_5_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_paleomagnetism_original" type="string" indexed="true" stored="false" />
-
-<!-- Geochemistry -->
-<field name="msl_geochemistry_1" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geochemistry_2" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geochemistry_3" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geochemistry_4" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_geochemistry" type="string" indexed="true" stored="false" />
-
-<field name="msl_geochemistry_1_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geochemistry_2_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geochemistry_3_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_geochemistry_4_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_geochemistry_original" type="string" indexed="true" stored="false" />
-
-<!--Microscopy -->
-<field name="msl_microscopy_1" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_microscopy_2" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_microscopy_3" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_microscopy_4" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_microscopy_5" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_microscopy" type="string" indexed="true" stored="false" />
-
-<field name="msl_microscopy_1_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_microscopy_2_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_microscopy_3_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_microscopy_4_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_microscopy_5_original" type="string" indexed="true" stored="true" multiValued="true"/>
-<field name="msl_has_microscopy_original" type="string" indexed="true" stored="false" />
-
-<!-- fields for top level facets labs/organizations -->
-<field name="msl_has_lab" type="string" indexed="true" stored="false" />
-<field name="msl_has_organization" type="string" indexed="true" stored="false" />
-
-</fields>
-
-<uniqueKey>index_id</uniqueKey>
-<defaultSearchField>text</defaultSearchField>
-<solrQueryParser defaultOperator="AND"/>
-
-<copyField source="url" dest="urls"/>
-<copyField source="title" dest="title_ngram"/>
-<copyField source="name" dest="name_ngram"/>
-<copyField source="ckan_url" dest="urls"/>
-<copyField source="download_url" dest="urls"/>
-<copyField source="res_url" dest="urls"/>
-<copyField source="extras_*" dest="text"/>
-<copyField source="res_extras_*" dest="text"/>
-<copyField source="vocab_*" dest="text"/>
-<copyField source="urls" dest="text"/>
-<copyField source="name" dest="text"/>
-<copyField source="title" dest="text"/>
-<copyField source="text" dest="text"/>
-<copyField source="license" dest="text"/>
-<copyField source="notes" dest="text"/>
-<copyField source="tags" dest="text"/>
-<copyField source="groups" dest="text"/>
-<copyField source="organization" dest="text"/>
-<copyField source="res_name" dest="text"/>
-<copyField source="res_description" dest="text"/>
-<copyField source="maintainer" dest="text"/>
-<copyField source="author" dest="text"/>
-
-<!-- customizations MSL-->
-<copyField source="msl_material" dest="text"/>
-<copyField source="msl_hidden_text" dest="text"/>
-
-<copyField source="msl_author_name" dest="text"/>
-<copyField source="msl_author_name" dest="msl_author_name_text"/>
-
-<copyField source="msl_lab_name" dest="text"/>
-<copyField source="msl_lab_name" dest="msl_lab_name_text"/>
-
-</schema>
diff --git a/roles/common/tasks/firewalld.yml b/roles/common/tasks/firewalld.yml
index 08ddbd3..cb4d132 100644
--- a/roles/common/tasks/firewalld.yml
+++ b/roles/common/tasks/firewalld.yml
@@ -9,7 +9,7 @@
 
 
 - name: Ensure firewall is running and enabled
-  ansible.builtin.service:
+  ansible.builtin.systemd_service:
     name: firewalld
     state: started
     enabled: true
diff --git a/roles/msl_api/defaults/main.yml b/roles/msl_api/defaults/main.yml
index d7519a9..6df8461 100644
--- a/roles/msl_api/defaults/main.yml
+++ b/roles/msl_api/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # copyright Utrecht University
 
-msl_api_version: 1.4.0
+msl_api_version: 1.5.0
 msl_api_database: mslapi
 msl_api_database_user: msl
 msl_api_user: www-data