diff --git a/web/modules/custom/drutopia_case_study/config/install/config_snapshot.snapshot.config_sync.module.drutopia_case_study.yml b/web/modules/custom/drutopia_case_study/config/install/config_snapshot.snapshot.config_sync.module.drutopia_case_study.yml
new file mode 100644
index 0000000..2cb9c89
--- /dev/null
+++ b/web/modules/custom/drutopia_case_study/config/install/config_snapshot.snapshot.config_sync.module.drutopia_case_study.yml
@@ -0,0 +1,34 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - drutopia_case_study
+id: config_sync.module.drutopia_case_study
+snapshotSet: config_sync
+extensionType: module
+extensionName: drutopia_case_study
+items:
+  -
+    collection: ''
+    name: taxonomy.vocabulary.services
+    data:
+      langcode: en
+      status: true
+      dependencies: {  }
+      name: Services
+      vid: services
+      description: ''
+      hierarchy: 0
+      weight: 0
+  -
+    collection: ''
+    name: taxonomy.vocabulary.technologies
+    data:
+      langcode: en
+      status: true
+      dependencies: {  }
+      name: Technologies
+      vid: technologies
+      description: ''
+      hierarchy: 0
+      weight: 0
diff --git a/web/modules/custom/drutopia_case_study/config/install/core.entity_form_display.node.case_study.default.yml b/web/modules/custom/drutopia_case_study/config/install/core.entity_form_display.node.case_study.default.yml
index 5d61e2a..8ad387d 100644
--- a/web/modules/custom/drutopia_case_study/config/install/core.entity_form_display.node.case_study.default.yml
+++ b/web/modules/custom/drutopia_case_study/config/install/core.entity_form_display.node.case_study.default.yml
@@ -9,13 +9,13 @@ dependencies:
     - field.field.node.case_study.field_case_study_status
     - field.field.node.case_study.field_case_study_subtitle
     - field.field.node.case_study.field_case_study_team
-    - field.field.node.case_study.field_case_study_technologies
     - field.field.node.case_study.field_case_study_year
     - field.field.node.case_study.field_image
     - field.field.node.case_study.field_license
     - field.field.node.case_study.field_meta_tags
     - field.field.node.case_study.field_services
     - field.field.node.case_study.field_summary
+    - field.field.node.case_study.field_technologies
     - image.style.thumbnail
     - node.type.case_study
   module:
@@ -88,15 +88,6 @@ content:
     third_party_settings: {  }
     type: entity_reference_autocomplete
     region: content
-  field_case_study_technologies:
-    weight: 8
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: entity_reference_autocomplete
-    region: content
   field_case_study_year:
     weight: 6
     settings:
@@ -128,7 +119,7 @@ content:
     type: metatag_firehose
     region: content
   field_services:
-    weight: 9
+    weight: 8
     settings:
       match_operator: CONTAINS
       size: 60
@@ -144,6 +135,15 @@ content:
     third_party_settings: {  }
     type: text_textarea
     region: content
+  field_technologies:
+    weight: 9
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: entity_reference_autocomplete
+    region: content
   path:
     type: path
     weight: 15
diff --git a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.card.yml b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.card.yml
index 70be11b..5ddc3f6 100644
--- a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.card.yml
+++ b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.card.yml
@@ -10,7 +10,6 @@ dependencies:
     - field.field.node.case_study.field_case_study_status
     - field.field.node.case_study.field_case_study_subtitle
     - field.field.node.case_study.field_case_study_team
-    - field.field.node.case_study.field_case_study_technologies
     - field.field.node.case_study.field_case_study_year
     - field.field.node.case_study.field_image
     - field.field.node.case_study.field_license
@@ -97,7 +96,6 @@ hidden:
   field_case_study_partners: true
   field_case_study_status: true
   field_case_study_team: true
-  field_case_study_technologies: true
   field_case_study_year: true
   field_license: true
   field_meta_tags: true
diff --git a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.default.yml b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.default.yml
index 615f769..739f326 100644
--- a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.default.yml
+++ b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.default.yml
@@ -9,13 +9,13 @@ dependencies:
     - field.field.node.case_study.field_case_study_status
     - field.field.node.case_study.field_case_study_subtitle
     - field.field.node.case_study.field_case_study_team
-    - field.field.node.case_study.field_case_study_technologies
     - field.field.node.case_study.field_case_study_year
     - field.field.node.case_study.field_image
     - field.field.node.case_study.field_license
     - field.field.node.case_study.field_meta_tags
     - field.field.node.case_study.field_services
     - field.field.node.case_study.field_summary
+    - field.field.node.case_study.field_technologies
     - node.type.case_study
   module:
     - ds
@@ -50,6 +50,14 @@ content:
     third_party_settings: {  }
     type: text_default
     region: content
+  field_technologies:
+    weight: 3
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    type: entity_reference_label
+    region: content
 hidden:
   body: true
   field_body_paragraph: true
@@ -58,7 +66,6 @@ hidden:
   field_case_study_status: true
   field_case_study_subtitle: true
   field_case_study_team: true
-  field_case_study_technologies: true
   field_case_study_year: true
   field_image: true
   field_meta_tags: true
diff --git a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.full.yml b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.full.yml
index 623911e..a11cd36 100644
--- a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.full.yml
+++ b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.full.yml
@@ -10,7 +10,6 @@ dependencies:
     - field.field.node.case_study.field_case_study_status
     - field.field.node.case_study.field_case_study_subtitle
     - field.field.node.case_study.field_case_study_team
-    - field.field.node.case_study.field_case_study_technologies
     - field.field.node.case_study.field_case_study_year
     - field.field.node.case_study.field_image
     - field.field.node.case_study.field_license
@@ -104,15 +103,6 @@ content:
       view_mode: default
       link: false
     third_party_settings: {  }
-  field_case_study_technologies:
-    type: entity_reference_entity_view
-    weight: 7
-    region: content
-    label: above
-    settings:
-      view_mode: default
-      link: false
-    third_party_settings: {  }
   field_case_study_year:
     type: number_integer
     weight: 5
diff --git a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.search_index.yml b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.search_index.yml
index e36109d..f631eff 100644
--- a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.search_index.yml
+++ b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.search_index.yml
@@ -10,7 +10,6 @@ dependencies:
     - field.field.node.case_study.field_case_study_status
     - field.field.node.case_study.field_case_study_subtitle
     - field.field.node.case_study.field_case_study_team
-    - field.field.node.case_study.field_case_study_technologies
     - field.field.node.case_study.field_case_study_year
     - field.field.node.case_study.field_image
     - field.field.node.case_study.field_license
@@ -43,7 +42,6 @@ hidden:
   field_case_study_status: true
   field_case_study_subtitle: true
   field_case_study_team: true
-  field_case_study_technologies: true
   field_case_study_year: true
   field_image: true
   field_license: true
diff --git a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.small_card.yml b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.small_card.yml
index af7fe00..7aa5f6b 100644
--- a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.small_card.yml
+++ b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.small_card.yml
@@ -10,11 +10,12 @@ dependencies:
     - field.field.node.case_study.field_case_study_status
     - field.field.node.case_study.field_case_study_subtitle
     - field.field.node.case_study.field_case_study_team
-    - field.field.node.case_study.field_case_study_technologies
     - field.field.node.case_study.field_case_study_year
     - field.field.node.case_study.field_image
+    - field.field.node.case_study.field_license
     - field.field.node.case_study.field_meta_tags
     - field.field.node.case_study.field_services
+    - field.field.node.case_study.field_summary
     - node.type.case_study
   module:
     - ds
@@ -103,15 +104,6 @@ content:
       view_mode: default
       link: false
     third_party_settings: {  }
-  field_case_study_technologies:
-    type: entity_reference_entity_view
-    weight: 0
-    region: content
-    label: above
-    settings:
-      view_mode: default
-      link: false
-    third_party_settings: {  }
   field_case_study_year:
     type: number_integer
     weight: 0
@@ -147,4 +139,6 @@ content:
       link: false
     third_party_settings: {  }
 hidden:
+  field_license: true
+  field_summary: true
   links: true
diff --git a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.tile.yml b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.tile.yml
index dffa1b8..a7dbb69 100644
--- a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.tile.yml
+++ b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.node.case_study.tile.yml
@@ -10,11 +10,12 @@ dependencies:
     - field.field.node.case_study.field_case_study_status
     - field.field.node.case_study.field_case_study_subtitle
     - field.field.node.case_study.field_case_study_team
-    - field.field.node.case_study.field_case_study_technologies
     - field.field.node.case_study.field_case_study_year
     - field.field.node.case_study.field_image
+    - field.field.node.case_study.field_license
     - field.field.node.case_study.field_meta_tags
     - field.field.node.case_study.field_services
+    - field.field.node.case_study.field_summary
     - node.type.case_study
     - responsive_image.styles.wide
   module:
@@ -90,8 +91,9 @@ hidden:
   field_case_study_partners: true
   field_case_study_status: true
   field_case_study_team: true
-  field_case_study_technologies: true
   field_case_study_year: true
+  field_license: true
   field_meta_tags: true
   field_services: true
+  field_summary: true
   links: true
diff --git a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.taxonomy_term.license.default.yml b/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.taxonomy_term.license.default.yml
deleted file mode 100644
index c3bf350..0000000
--- a/web/modules/custom/drutopia_case_study/config/install/core.entity_view_display.taxonomy_term.license.default.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.license
-  module:
-    - ds
-    - text
-third_party_settings:
-  ds:
-    layout:
-      id: layout_onecol
-      library: layout_discovery/onecol
-      disable_css: false
-      entity_classes: all_classes
-      settings: {  }
-    regions:
-      content:
-        - description
-id: taxonomy_term.license.default
-targetEntityType: taxonomy_term
-bundle: license
-mode: default
-content:
-  description:
-    label: hidden
-    type: text_default
-    weight: 0
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/web/modules/custom/drutopia_case_study/config/install/field.field.node.case_study.field_license.yml b/web/modules/custom/drutopia_case_study/config/install/field.field.node.case_study.field_license.yml
new file mode 100644
index 0000000..0035133
--- /dev/null
+++ b/web/modules/custom/drutopia_case_study/config/install/field.field.node.case_study.field_license.yml
@@ -0,0 +1,32 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_license
+    - node.type.case_study
+    - taxonomy.vocabulary.license
+  content:
+    - 'taxonomy_term:license:61745acc-d11c-4e65-bd9e-518d223fedab'
+id: node.case_study.field_license
+field_name: field_license
+entity_type: node
+bundle: case_study
+label: License
+description: ''
+required: false
+translatable: false
+default_value:
+  -
+    target_uuid: 61745acc-d11c-4e65-bd9e-518d223fedab
+default_value_callback: ''
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      license: license
+    sort:
+      field: name
+      direction: asc
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference
diff --git a/web/modules/custom/drutopia_case_study/config/install/field.field.node.case_study.field_services.yml b/web/modules/custom/drutopia_case_study/config/install/field.field.node.case_study.field_services.yml
new file mode 100644
index 0000000..d002a22
--- /dev/null
+++ b/web/modules/custom/drutopia_case_study/config/install/field.field.node.case_study.field_services.yml
@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_services
+    - node.type.case_study
+    - taxonomy.vocabulary.services
+id: node.case_study.field_services
+field_name: field_services
+entity_type: node
+bundle: case_study
+label: Services
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      services: services
+    sort:
+      field: name
+      direction: asc
+    auto_create: true
+    auto_create_bundle: ''
+field_type: entity_reference
diff --git a/web/modules/custom/drutopia_case_study/config/install/field.field.node.case_study.field_technologies.yml b/web/modules/custom/drutopia_case_study/config/install/field.field.node.case_study.field_technologies.yml
new file mode 100644
index 0000000..cda97d4
--- /dev/null
+++ b/web/modules/custom/drutopia_case_study/config/install/field.field.node.case_study.field_technologies.yml
@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_technologies
+    - node.type.case_study
+    - taxonomy.vocabulary.technologies
+id: node.case_study.field_technologies
+field_name: field_technologies
+entity_type: node
+bundle: case_study
+label: Technologies
+description: '<a href="/admin/structure/taxonomy/manage/technologies/add">Add new technology term</a>'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      technologies: technologies
+    sort:
+      field: name
+      direction: asc
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference
diff --git a/web/modules/custom/drutopia_case_study/config/install/field.storage.node.field_services.yml b/web/modules/custom/drutopia_case_study/config/install/field.storage.node.field_services.yml
new file mode 100644
index 0000000..c352674
--- /dev/null
+++ b/web/modules/custom/drutopia_case_study/config/install/field.storage.node.field_services.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - taxonomy
+id: node.field_services
+field_name: field_services
+entity_type: node
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/web/modules/custom/drutopia_case_study/config/install/field.storage.node.field_technologies.yml b/web/modules/custom/drutopia_case_study/config/install/field.storage.node.field_technologies.yml
new file mode 100644
index 0000000..b5e06a2
--- /dev/null
+++ b/web/modules/custom/drutopia_case_study/config/install/field.storage.node.field_technologies.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - taxonomy
+id: node.field_technologies
+field_name: field_technologies
+entity_type: node
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/web/modules/custom/drutopia_case_study/config/install/search_api.index.case_study.yml b/web/modules/custom/drutopia_case_study/config/install/search_api.index.case_study.yml
index e912407..166b730 100644
--- a/web/modules/custom/drutopia_case_study/config/install/search_api.index.case_study.yml
+++ b/web/modules/custom/drutopia_case_study/config/install/search_api.index.case_study.yml
@@ -1,21 +1,20 @@
 langcode: en
 status: true
 dependencies:
+  config:
+    - field.storage.node.field_case_study_client
+    - field.storage.node.field_case_study_partners
+    - field.storage.node.field_case_study_status
+    - field.storage.node.field_case_study_subtitle
+    - field.storage.node.field_case_study_team
+    - field.storage.node.field_case_study_year
+    - field.storage.node.field_services
+    - field.storage.node.field_summary
+    - search_api.server.database
   module:
     - user
     - search_api
     - node
-  config:
-    - field.storage.node.field_case_study_client
-    - field.storage.node.field_case_study_partners
-    - field.storage.node.field_services
-    - field.storage.node.field_case_study_status
-    - field.storage.node.field_case_study_subtitle
-    - field.storage.node.field_summary
-    - field.storage.node.field_case_study_team
-    - field.storage.node.field_case_study_technologies
-    - field.storage.node.field_case_study_year
-    - search_api.server.database
 id: case_study
 name: 'Case Study'
 description: 'An index for the case study content type.'
@@ -71,14 +70,6 @@ field_settings:
     dependencies:
       config:
         - field.storage.node.field_case_study_team
-  field_case_study_technologies:
-    label: Technologies
-    datasource_id: 'entity:node'
-    property_path: field_case_study_technologies
-    type: integer
-    dependencies:
-      config:
-        - field.storage.node.field_case_study_technologies
   field_case_study_year:
     label: Year
     datasource_id: 'entity:node'
diff --git a/web/modules/custom/drutopia_case_study/drutopia_case_study.features.yml b/web/modules/custom/drutopia_case_study/drutopia_case_study.features.yml
index 54a6109..a6551b0 100644
--- a/web/modules/custom/drutopia_case_study/drutopia_case_study.features.yml
+++ b/web/modules/custom/drutopia_case_study/drutopia_case_study.features.yml
@@ -1,12 +1,7 @@
 bundle: drutopia
 excluded:
-  - field.field.node.case_study.field_case_study_technologies
-  - field.field.node.case_study.field_license
-  - field.field.node.case_study.field_services
-  - field.storage.node.field_case_study_technologies
   - field.storage.node.field_license
-  - field.storage.node.field_services
+  - field.storage.node.field_case_study_technologies
   - taxonomy.vocabulary.license
-  - taxonomy.vocabulary.services
-  - taxonomy.vocabulary.technologies
+  - field.field.node.case_study.field_case_study_technologies
 required: true
diff --git a/web/modules/custom/drutopia_case_study/drutopia_case_study.info.yml b/web/modules/custom/drutopia_case_study/drutopia_case_study.info.yml
index e7f3fe7..e264ea3 100644
--- a/web/modules/custom/drutopia_case_study/drutopia_case_study.info.yml
+++ b/web/modules/custom/drutopia_case_study/drutopia_case_study.info.yml
@@ -3,6 +3,8 @@ description: 'A Case Study highlights work done on a project.'
 type: module
 core: 8.x
 dependencies:
+  - config_snapshot
+  - drutopia_case_study
   - drutopia_core
   - drutopia_creative_license
   - drutopia_people