diff --git a/config/sync/core.entity_view_display.node.document.highlighted.yml b/config/sync/core.entity_view_display.node.document.highlighted.yml
new file mode 100644
index 0000000000..66ef808670
--- /dev/null
+++ b/config/sync/core.entity_view_display.node.document.highlighted.yml
@@ -0,0 +1,137 @@
+uuid: 5fbb7f17-0be8-4c70-8a5c-ceb806015a8f
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.highlighted
+    - field.field.node.document.body
+    - field.field.node.document.field_comments
+    - field.field.node.document.field_document_logo
+    - field.field.node.document.field_document_publication_date
+    - field.field.node.document.field_document_spatial_coverage
+    - field.field.node.document.field_file
+    - field.field.node.document.field_keywords
+    - field.field.node.document.field_licence
+    - field.field.node.document.field_shared_in
+    - field.field.node.document.field_short_title
+    - field.field.node.document.field_site_featured
+    - field.field.node.document.field_state
+    - field.field.node.document.field_topic
+    - field.field.node.document.field_type
+    - field.field.node.document.og_audience
+    - node.type.document
+    - responsive_image.styles.highlighted_content
+  module:
+    - field_delimiter
+    - field_formatter_range
+    - field_group
+    - joinup_html_stripper
+    - layout_builder
+    - responsive_image
+    - template_suggestion
+    - user
+third_party_settings:
+  field_group:
+    group_categorisation:
+      children:
+        - field_document_publication_date
+        - field_licence
+        - field_short_title
+        - field_type
+      parent_name: ''
+      weight: 5
+      format_type: html_element
+      format_settings:
+        id: ''
+        classes: ''
+        element: div
+        show_label: true
+        label_element: h3
+        attributes: ''
+        effect: none
+        speed: fast
+      label: Categorisation
+      region: hidden
+    group_attachment:
+      children:
+        - field_file
+      parent_name: ''
+      weight: 7
+      format_type: html_element
+      format_settings:
+        id: ''
+        classes: ''
+        element: div
+        show_label: true
+        label_element: h3
+        attributes: ''
+        effect: none
+        speed: fast
+      label: Attachment
+      region: hidden
+  layout_builder:
+    allow_custom: false
+    enabled: false
+_core:
+  default_config_hash: IBVftmfYLkfapLokxuyLrv1me4toJj5yidZu0ixGxQM
+id: node.document.highlighted
+targetEntityType: node
+bundle: document
+mode: highlighted
+content:
+  body:
+    label: hidden
+    type: joinup_html_stripper_stripped
+    weight: 2
+    settings:
+      trim_length: 200
+    third_party_settings:
+      template_suggestion:
+        template_suggestion: ''
+    region: content
+  field_document_logo:
+    type: responsive_image
+    weight: 0
+    region: content
+    label: hidden
+    settings:
+      responsive_image_style: highlighted_content
+      image_link: ''
+    third_party_settings:
+      template_suggestion:
+        template_suggestion: ''
+  field_topic:
+    type: entity_reference_label
+    weight: 1
+    region: content
+    label: hidden
+    settings:
+      link: true
+    third_party_settings:
+      field_delimiter:
+        delimiter: ''
+      field_formatter_range:
+        order: 0
+        limit: 2
+        offset: 0
+      template_suggestion:
+        template_suggestion: ''
+hidden:
+  field_comments: true
+  field_document_publication_date: true
+  field_document_spatial_coverage: true
+  field_file: true
+  field_keywords: true
+  field_licence: true
+  field_shared_in: true
+  field_short_title: true
+  field_site_featured: true
+  field_state: true
+  field_type: true
+  langcode: true
+  links: true
+  og_audience: true
+  published_at: true
+  read_more: true
+  report: true
+  share_link: true
diff --git a/config/sync/core.entity_view_display.node.event.highlighted.yml b/config/sync/core.entity_view_display.node.event.highlighted.yml
index f6d4961202..fc54593a34 100644
--- a/config/sync/core.entity_view_display.node.event.highlighted.yml
+++ b/config/sync/core.entity_view_display.node.event.highlighted.yml
@@ -27,9 +27,13 @@ dependencies:
     - field.field.node.event.field_topic
     - field.field.node.event.og_audience
     - node.type.event
+    - responsive_image.styles.highlighted_content
   module:
-    - joinup_core
+    - field_delimiter
+    - field_formatter_range
+    - joinup_html_stripper
     - layout_builder
+    - responsive_image
     - template_suggestion
     - user
 third_party_settings:
@@ -41,29 +45,50 @@ targetEntityType: node
 bundle: event
 mode: highlighted
 content:
-  field_event_date:
+  body:
+    type: joinup_html_stripper_stripped
+    weight: 2
+    region: content
+    label: hidden
+    settings:
+      trim_length: 200
+    third_party_settings:
+      template_suggestion:
+        template_suggestion: ''
+  field_event_logo:
+    type: responsive_image
     weight: 0
+    region: content
     label: hidden
     settings:
-      timezone_override: ''
-      separator: to
-      default_format: d/m/Y
-      day_diff_format: d
-      month_diff_format: d/m
-      year_diff_format: d/m/Y
+      responsive_image_style: highlighted_content
+      image_link: ''
     third_party_settings:
       template_suggestion:
         template_suggestion: ''
-    type: daterange_condensed
+  field_topic:
+    type: entity_reference_label
+    weight: 1
     region: content
+    label: hidden
+    settings:
+      link: true
+    third_party_settings:
+      field_delimiter:
+        delimiter: ''
+      field_formatter_range:
+        order: 0
+        limit: 2
+        offset: 0
+      template_suggestion:
+        template_suggestion: ''
 hidden:
-  body: true
   field_attachment: true
   field_comments: true
   field_event_agenda: true
   field_event_contact_email: true
   field_event_coordinates: true
-  field_event_logo: true
+  field_event_date: true
   field_event_online_location: true
   field_event_spatial_coverage: true
   field_event_web_url: true
@@ -76,7 +101,6 @@ hidden:
   field_short_title: true
   field_site_featured: true
   field_state: true
-  field_topic: true
   langcode: true
   links: true
   og_audience: true
diff --git a/config/sync/core.entity_view_display.node.event.highlighted_event.yml b/config/sync/core.entity_view_display.node.event.highlighted_event.yml
new file mode 100644
index 0000000000..dfd008cb06
--- /dev/null
+++ b/config/sync/core.entity_view_display.node.event.highlighted_event.yml
@@ -0,0 +1,86 @@
+uuid: c8a8b7b3-2996-4276-81e9-f8ca6a274733
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.highlighted_event
+    - field.field.node.event.body
+    - field.field.node.event.field_attachment
+    - field.field.node.event.field_comments
+    - field.field.node.event.field_event_agenda
+    - field.field.node.event.field_event_contact_email
+    - field.field.node.event.field_event_coordinates
+    - field.field.node.event.field_event_date
+    - field.field.node.event.field_event_logo
+    - field.field.node.event.field_event_online_location
+    - field.field.node.event.field_event_spatial_coverage
+    - field.field.node.event.field_event_web_url
+    - field.field.node.event.field_keywords
+    - field.field.node.event.field_location
+    - field.field.node.event.field_organisation
+    - field.field.node.event.field_organisation_type
+    - field.field.node.event.field_scope
+    - field.field.node.event.field_shared_in
+    - field.field.node.event.field_short_title
+    - field.field.node.event.field_site_featured
+    - field.field.node.event.field_state
+    - field.field.node.event.field_topic
+    - field.field.node.event.og_audience
+    - node.type.event
+  module:
+    - joinup_core
+    - layout_builder
+    - template_suggestion
+    - user
+third_party_settings:
+  layout_builder:
+    allow_custom: false
+    enabled: false
+id: node.event.highlighted_event
+targetEntityType: node
+bundle: event
+mode: highlighted_event
+content:
+  field_event_date:
+    weight: 0
+    label: hidden
+    settings:
+      timezone_override: ''
+      separator: to
+      default_format: d/m/Y
+      day_diff_format: d
+      month_diff_format: d/m
+      year_diff_format: d/m/Y
+    third_party_settings:
+      template_suggestion:
+        template_suggestion: ''
+    type: daterange_condensed
+    region: content
+hidden:
+  body: true
+  field_attachment: true
+  field_comments: true
+  field_event_agenda: true
+  field_event_contact_email: true
+  field_event_coordinates: true
+  field_event_logo: true
+  field_event_online_location: true
+  field_event_spatial_coverage: true
+  field_event_web_url: true
+  field_keywords: true
+  field_location: true
+  field_organisation: true
+  field_organisation_type: true
+  field_scope: true
+  field_shared_in: true
+  field_short_title: true
+  field_site_featured: true
+  field_state: true
+  field_topic: true
+  langcode: true
+  links: true
+  og_audience: true
+  published_at: true
+  read_more: true
+  report: true
+  share_link: true
diff --git a/config/sync/core.entity_view_display.node.news.highlighted.yml b/config/sync/core.entity_view_display.node.news.highlighted.yml
new file mode 100644
index 0000000000..ebfb4a0c3c
--- /dev/null
+++ b/config/sync/core.entity_view_display.node.news.highlighted.yml
@@ -0,0 +1,113 @@
+uuid: 31b72862-7d67-46f5-8bb4-798fe4a2818c
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.highlighted
+    - field.field.node.news.body
+    - field.field.node.news.field_attachment
+    - field.field.node.news.field_comments
+    - field.field.node.news.field_keywords
+    - field.field.node.news.field_news_headline
+    - field.field.node.news.field_news_logo
+    - field.field.node.news.field_news_referenced_solution
+    - field.field.node.news.field_news_source_url
+    - field.field.node.news.field_news_spatial_coverage
+    - field.field.node.news.field_shared_in
+    - field.field.node.news.field_site_featured
+    - field.field.node.news.field_state
+    - field.field.node.news.field_topic
+    - field.field.node.news.og_audience
+    - node.type.news
+    - responsive_image.styles.highlighted_content
+  module:
+    - field_delimiter
+    - field_formatter_range
+    - field_group
+    - joinup_html_stripper
+    - layout_builder
+    - responsive_image
+    - template_suggestion
+    - user
+third_party_settings:
+  field_group:
+    group_references:
+      children:
+        - field_news_source_url
+      parent_name: ''
+      weight: 19
+      format_type: html_element
+      format_settings:
+        id: ''
+        classes: ''
+        element: div
+        show_label: true
+        label_element: h3
+        attributes: ''
+        effect: none
+        speed: fast
+      label: References
+      region: hidden
+  layout_builder:
+    allow_custom: false
+    enabled: false
+id: node.news.highlighted
+targetEntityType: node
+bundle: news
+mode: highlighted
+content:
+  body:
+    label: hidden
+    type: joinup_html_stripper_stripped
+    weight: 2
+    settings:
+      trim_length: 200
+    third_party_settings:
+      template_suggestion:
+        template_suggestion: ''
+    region: content
+  field_news_logo:
+    type: responsive_image
+    weight: 0
+    region: content
+    label: hidden
+    settings:
+      responsive_image_style: highlighted_content
+      image_link: content
+    third_party_settings:
+      template_suggestion:
+        template_suggestion: ''
+  field_topic:
+    type: entity_reference_label
+    weight: 1
+    region: content
+    label: hidden
+    settings:
+      link: true
+    third_party_settings:
+      field_delimiter:
+        delimiter: ''
+      field_formatter_range:
+        order: 0
+        limit: 2
+        offset: 0
+      template_suggestion:
+        template_suggestion: ''
+hidden:
+  field_attachment: true
+  field_comments: true
+  field_keywords: true
+  field_news_headline: true
+  field_news_referenced_solution: true
+  field_news_source_url: true
+  field_news_spatial_coverage: true
+  field_shared_in: true
+  field_site_featured: true
+  field_state: true
+  langcode: true
+  links: true
+  og_audience: true
+  published_at: true
+  read_more: true
+  report: true
+  share_link: true
diff --git a/config/sync/core.entity_view_display.rdf_entity.solution.highlighted.yml b/config/sync/core.entity_view_display.rdf_entity.solution.highlighted.yml
index 91de51cfd7..74bc9a7c31 100644
--- a/config/sync/core.entity_view_display.rdf_entity.solution.highlighted.yml
+++ b/config/sync/core.entity_view_display.rdf_entity.solution.highlighted.yml
@@ -46,14 +46,14 @@ dependencies:
     - field.field.rdf_entity.solution.field_status
     - field.field.rdf_entity.solution.field_topic
     - rdf_entity.rdfentity.solution
-    - responsive_image.styles.highlighted_solution
+    - responsive_image.styles.highlighted_content
   module:
     - field_delimiter
     - field_formatter_range
     - field_group
+    - joinup_html_stripper
     - layout_builder
     - responsive_image
-    - smart_trim
     - template_suggestion
     - user
 third_party_settings:
@@ -83,33 +83,22 @@ bundle: solution
 mode: highlighted
 content:
   field_is_description:
-    type: smart_trim
-    weight: 3
-    region: content
     label: hidden
+    type: joinup_html_stripper_stripped
+    weight: 2
     settings:
       trim_length: 200
-      trim_type: chars
-      trim_suffix: ''
-      wrap_class: trimmed
-      more_text: More
-      more_class: more-link
-      trim_options:
-        text: true
-        trim_zero: false
-      wrap_output: false
-      more_link: false
-      summary_handler: full
     third_party_settings:
       template_suggestion:
         template_suggestion: ''
+    region: content
   field_is_logo:
     type: responsive_image
     weight: 0
     region: content
     label: hidden
     settings:
-      responsive_image_style: highlighted_solution
+      responsive_image_style: highlighted_content
       image_link: content
     third_party_settings:
       template_suggestion:
diff --git a/config/sync/core.entity_view_mode.node.highlighted_event.yml b/config/sync/core.entity_view_mode.node.highlighted_event.yml
new file mode 100644
index 0000000000..eb158adab9
--- /dev/null
+++ b/config/sync/core.entity_view_mode.node.highlighted_event.yml
@@ -0,0 +1,10 @@
+uuid: f0f4ebec-5d74-4af5-8676-7c741149ec6d
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: node.highlighted_event
+label: 'Highlighted event'
+targetEntityType: node
+cache: true
diff --git a/config/sync/entityqueue.entity_queue.highlighted_solution.yml b/config/sync/entityqueue.entity_queue.highlighted_content.yml
similarity index 53%
rename from config/sync/entityqueue.entity_queue.highlighted_solution.yml
rename to config/sync/entityqueue.entity_queue.highlighted_content.yml
index 3b3a5d60f6..aa33fe70db 100644
--- a/config/sync/entityqueue.entity_queue.highlighted_solution.yml
+++ b/config/sync/entityqueue.entity_queue.highlighted_content.yml
@@ -1,23 +1,25 @@
-uuid: c40d0c80-bf7c-4f00-831e-b77871742309
+uuid: d51790d4-39e1-4b51-b2f3-9f9621ff06e6
 langcode: en
 status: true
 dependencies:
   module:
-    - rdf_entity
-id: highlighted_solution
-label: 'Highlighted solution'
+    - node
+id: highlighted_content
+label: 'Highlighted content'
 handler: simple
 handler_configuration: {  }
 entity_settings:
-  target_type: rdf_entity
-  handler: 'default:rdf_entity'
+  target_type: node
+  handler: 'default:node'
   handler_settings:
     target_bundles:
-      solution: solution
+      document: document
+      event: event
+      news: news
     sort:
       field: _none
     auto_create: false
-    auto_create_bundle: ''
+    auto_create_bundle: event
 queue_settings:
   min_size: 1
   max_size: 1
diff --git a/config/sync/page_manager.page_variant.homepage-layout_builder-0.yml b/config/sync/page_manager.page_variant.homepage-layout_builder-0.yml
index 4a422cc7f2..fb4f561dae 100644
--- a/config/sync/page_manager.page_variant.homepage-layout_builder-0.yml
+++ b/config/sync/page_manager.page_variant.homepage-layout_builder-0.yml
@@ -31,18 +31,18 @@ variant_settings:
             context_mapping: {  }
           additional: {  }
           weight: 0
-        204e8ccb-280d-4ee4-b598-74b9f96d6496:
-          uuid: 204e8ccb-280d-4ee4-b598-74b9f96d6496
+        7807ee72-f98e-46bb-80d9-fe1d2b6cd8de:
+          uuid: 7807ee72-f98e-46bb-80d9-fe1d2b6cd8de
           region: second
           configuration:
-            id: 'entityqueue_block:highlighted_solution'
-            label: 'Highlighted solution'
+            id: 'entityqueue_block:highlighted_content'
+            label: 'Highlighted content'
             provider: entityqueue_block
             label_display: visible
             view_mode: highlighted
             context_mapping: {  }
           additional: {  }
-          weight: 0
+          weight: 1
       third_party_settings: {  }
     -
       layout_id: joinup_layout_twocol_60_40
@@ -70,7 +70,7 @@ variant_settings:
             label: 'Highlighted event'
             provider: entityqueue_block
             label_display: visible
-            view_mode: highlighted
+            view_mode: highlighted_event
             context_mapping: {  }
           additional: {  }
           weight: 0
diff --git a/config/sync/responsive_image.styles.highlighted_solution.yml b/config/sync/responsive_image.styles.highlighted_content.yml
similarity index 97%
rename from config/sync/responsive_image.styles.highlighted_solution.yml
rename to config/sync/responsive_image.styles.highlighted_content.yml
index 7cc3d325a9..11351d344b 100644
--- a/config/sync/responsive_image.styles.highlighted_solution.yml
+++ b/config/sync/responsive_image.styles.highlighted_content.yml
@@ -20,8 +20,8 @@ dependencies:
     - image.style.xxl_col_5_2x
   theme:
     - ventuno
-id: highlighted_solution
-label: 'Highlighted solution'
+id: highlighted_content
+label: 'Highlighted content'
 image_style_mappings:
   -
     breakpoint_id: ventuno.xl
diff --git a/config/sync/user.role.moderator.yml b/config/sync/user.role.moderator.yml
index c1fbd7b97c..3604caae0e 100644
--- a/config/sync/user.role.moderator.yml
+++ b/config/sync/user.role.moderator.yml
@@ -232,8 +232,8 @@ permissions:
   - 'update any simple_block block content'
   - 'update collection_settings meta-entity'
   - 'update discover_topics entityqueue'
+  - 'update highlighted_content entityqueue'
   - 'update highlighted_event entityqueue'
-  - 'update highlighted_solution entityqueue'
   - 'update paragraph content iframe'
   - 'update paragraph content json_map'
   - 'update site alerts'
diff --git a/config/sync/views.view.curated_content_listings.yml b/config/sync/views.view.curated_content_listings.yml
index 8da28174ca..c164d123a6 100644
--- a/config/sync/views.view.curated_content_listings.yml
+++ b/config/sync/views.view.curated_content_listings.yml
@@ -24,8 +24,8 @@ display:
         options:
           permissions:
             - 'update discover_topics entityqueue'
+            - 'update highlighted_content entityqueue'
             - 'update highlighted_event entityqueue'
-            - 'update highlighted_solution entityqueue'
             - 'update spotlight entityqueue'
           operator: or
       cache:
diff --git a/tests/behat.yml.dist b/tests/behat.yml.dist
index edaab95926..21c9383cb9 100644
--- a/tests/behat.yml.dist
+++ b/tests/behat.yml.dist
@@ -100,8 +100,8 @@ default:
       region_map:
         Administration toolbar: '#toolbar-administration'
         Comment: '.comments-section'
-        Content listing field filter form: '.field--name-field-content-listing'
         Contact information inline form: '#edit-field-ar-contact-information-wrapper'
+        Content listing field filter form: '.field--name-field-content-listing'
         Content: '.section--content-middle, main .layout-content'
         Cookie consent banner: '#cookie-consent-banner'
         Discover topics block: '.block-views-blockdiscover-topics-block'
@@ -112,14 +112,14 @@ default:
         Hamburger menu: 'nav.joinup-navbar ul.navbar-nav ul.accordion-list'
         Header menu: '#block-joinup-theme-main-menu'
         Header: '.section--featured, .section-header'
+        Highlighted content: '.block-entityqueue--highlighted-content'
         Highlighted event: '.block-entityqueue--highlighted-event'
-        Highlighted solution: '.block-entityqueue--highlighted-solution'
         In the spotlight: '.block-views-blockin-the-spotlight-block'
         Left sidebar: '.section--sidebar-left'
         Main solution vertical tab: '#edit-group-main'
         Management solution vertical tab: '#edit-group-management'
-        Members admin form header: '#edit-header'
         Members admin form actions: '#edit-action'
+        Members admin form header: '#edit-header'
         Modal buttons: '.ui-dialog-buttonpane'
         Modal content: '#drupal-modal'
         Modal title: '.ui-dialog-title'
diff --git a/tests/features/homepage.feature b/tests/features/homepage.feature
index a489c49ee2..aef9365e7e 100644
--- a/tests/features/homepage.feature
+++ b/tests/features/homepage.feature
@@ -90,25 +90,34 @@ Feature: Homepage
       | 3      | alan.jpg    | HR, Statistics and Analysis      | Microgravity    | Conventional studies investigating the effects of reduced gravity on muscle mass and function have used a ground control group that is not directly comparable to the space experimental group. |
 
   @terms
-  Scenario: A solution can be highlighted on the homepage
-    Given solution:
-      | title         | Mercury poisoning                                                          |
-      | state         | validated                                                                  |
-      | description   | Mercury poisoning is a type of metal poisoning due to exposure to mercury. |
-      | logo          | logo.png                                                                   |
-      | solution type | Interoperability Specification, Networking Service                         |
-      | topic         | Demography, EU and European Policies, HR                                   |
-      | state         | validated                                                                  |
-    And the "Highlighted solution" content listing contains:
-      | type     | label             |
-      | solution | Mercury poisoning |
+  Scenario Outline: Community content be highlighted on the homepage
+    Given collection:
+      | title | Clash of documents |
+      | state | validated          |
+    And <type> content:
+      | title        | collection         | topic                              | state     | logo     | body                                                                                                                                                                                            |
+      | Microgravity | Clash of documents | HR, E-justice                      | validated | alan.jpg | Conventional studies investigating the effects of reduced gravity on muscle mass and function have used a ground control group that is not directly comparable to the space experimental group. |
+      | Aliens       | Clash of documents | Statistics and Analysis, E-justice | validated | alan.jpg | Conventional studies investigating the effects of reduced gravity on muscle mass and function have used a ground control group that is not directly comparable to the space experimental group. |
+      | Groundforce  | Clash of documents | Statistics and Analysis, E-justice | proposed  | alan.jpg | Conventional studies investigating the effects of reduced gravity on muscle mass and function have used a ground control group that is not directly comparable to the space experimental group. |
+    And the "Highlighted content" content listing contains:
+      | type   | label  |
+      | <type> | Aliens |
 
     When I am on the homepage
-    Then I should see "Mercury poisoning" as the highlighted solution
-    And I should see the link "More solutions"
-    When I click "More solutions"
+    Then I should see "Aliens" as the Highlighted content
+    And I should see the link "Related content"
+    When I click "Related content"
     Then I should be on the advanced search page
-    And the "Solution" content checkbox item should be selected
+    And the <label> content checkbox item should be selected
+    And I should see the "Aliens" tile
+    And I should not see the "Microgravity" tile
+    And I should not see the "Groundforce" tile
+
+    Examples:
+      | type     | label    |
+      | document | Document |
+      | news     | News     |
+      | event    | Event    |
 
   Scenario: An event can be highlighted on the homepage
     Given event content:
diff --git a/tests/features/joinup_core/social_share.feature b/tests/features/joinup_core/social_share.feature
index d55f3f4e24..74df3d4dbc 100644
--- a/tests/features/joinup_core/social_share.feature
+++ b/tests/features/joinup_core/social_share.feature
@@ -39,8 +39,7 @@ Feature: Sharing content on social networks
       | Important solution | Social networks | validated |
 
     When I am logged in as a user with the "authenticated" role
-    And I am on the homepage
-    And I click "More solutions"
+    And I visit the search page
     And I click the contextual link "Share" in the "Important solution" tile
 
     And I should see the link "Facebook"
diff --git a/tests/features/moderator/curated_content_listings.feature b/tests/features/moderator/curated_content_listings.feature
index 15fdf64faf..97b9486079 100644
--- a/tests/features/moderator/curated_content_listings.feature
+++ b/tests/features/moderator/curated_content_listings.feature
@@ -10,10 +10,10 @@ Feature: Curated content listings
     And I click "Curated content listings"
     Then I should see the heading "Curated content listings"
     And I should see the following links:
-      | Discover topics      |
-      | Highlighted event    |
-      | Highlighted solution |
-      | In the spotlight     |
+      | Discover topics     |
+      | Highlighted event   |
+      | Highlighted content |
+      | In the spotlight    |
     When I click "Discover topics"
     Then I should see the heading "Update curated content listing Discover topics"
     And I should see the button "Add item"
@@ -27,19 +27,19 @@ Feature: Curated content listings
     And I am on the homepage
     Then I should not see any contextual links in the "In the spotlight" region
     And I should not see any contextual links in the "Highlighted event" region
-    And I should not see any contextual links in the "Highlighted solution" region
+    And I should not see any contextual links in the "Highlighted content" region
 
     Given I am logged in as an "authenticated user"
     And I am on the homepage
     Then I should not see any contextual links in the "In the spotlight" region
     And I should not see any contextual links in the "Highlighted event" region
-    And I should not see any contextual links in the "Highlighted solution" region
+    And I should not see any contextual links in the "Highlighted content" region
 
     Given I am logged in as a "moderator"
     And I am on the homepage
     Then I should see the contextual link "Update curated content" in the "In the spotlight" region
     And I should see the contextual link "Update curated content" in the "Highlighted event" region
-    And I should see the contextual link "Update curated content" in the "Highlighted solution" region
+    And I should see the contextual link "Update curated content" in the "Highlighted content" region
 
     Given I am on the homepage
     When I click the contextual link "Update curated content" in the "In the spotlight" region
@@ -50,5 +50,5 @@ Feature: Curated content listings
     Then I should see the heading "Update curated content listing Highlighted event"
 
     Given I am on the homepage
-    When I click the contextual link "Update curated content" in the "Highlighted solution" region
-    Then I should see the heading "Update curated content listing Highlighted solution"
+    When I click the contextual link "Update curated content" in the "Highlighted content" region
+    Then I should see the heading "Update curated content listing Highlighted content"
diff --git a/tests/src/Context/JoinupCommunityContentContext.php b/tests/src/Context/JoinupCommunityContentContext.php
index a35ce84281..c196a9125f 100644
--- a/tests/src/Context/JoinupCommunityContentContext.php
+++ b/tests/src/Context/JoinupCommunityContentContext.php
@@ -15,6 +15,7 @@
 use Drupal\joinup\Traits\TestingEntitiesTrait;
 use Drupal\joinup\Traits\TraversingTrait;
 use Drupal\joinup_community_content\CommunityContentHelper;
+use Drupal\joinup_community_content\Entity\CommunityContentInterface;
 use Drupal\joinup_group\Entity\PinnableGroupContentInterface;
 use Drupal\joinup_group\Exception\MissingGroupException;
 use Drupal\joinup_publication_date\Entity\EntityPublicationTimeInterface;
@@ -513,4 +514,67 @@ public function assertInTheSpotlight(TableNode $table) {
     }
   }
 
+  /**
+   * Checks the contents of the "Highlighted content" block.
+   *
+   * This is shown on the homepage.
+   *
+   * @param string $label
+   *   The label of the community content that is highlighted on the homepage.
+   *
+   * @Then I should see :label as the Highlighted content
+   */
+  public function assertHighlightedContent(string $label): void {
+    $content = self::getNodeByTitle($label);
+
+    // Only community content can be highlighted.
+    Assert::assertInstanceOf(CommunityContentInterface::class, $content);
+
+    $block_element = $this->getSession()->getPage()->find('css', '.block-entityqueue--highlighted-content');
+
+    // Check block title.
+    $actual_block_title = $block_element->find('css', 'h2')->getText();
+    Assert::assertEquals('Highlighted content', $actual_block_title, sprintf('Expected the Highlighted content block to have the title "Highlighted content" but instead found "%s".', $actual_block_title));
+
+    // Check that the logo is present.
+    if ($logo = $content->getLogoAsFile()) {
+      $filename = $logo->getFilename();
+      $logo_is_present = self::hasImage($filename, $block_element);
+      Assert::assertTrue($logo_is_present, sprintf('Image with filename "%s" has been found in the Highlighted content block.', $filename));
+    }
+
+    // Check title text.
+    $actual_title = $block_element->find('css', 'article h2')->getText();
+    Assert::assertEquals($content->label(), $actual_title, sprintf('Expected the Highlighted content to have the title "%s" but instead found "%s".', $content->label(), $actual_title));
+
+    // Check that title links to the canonical page of the content.
+    $xpath = '//h2/a[@href = "' . $content->toUrl()->toString() . '"]';
+    Assert::assertNotEmpty($block_element->find('xpath', $xpath), sprintf('%s "%s" does not link to the canonical page.', $content->getType(), $actual_title));
+
+    // Retrieve the topics from the content, limiting the result to maximum 2
+    // topics.
+    $topics = array_slice($content->getTopics(), 0, 2);
+
+    // Check that the correct number of topics are present.
+    $topic_elements = $block_element->findAll('css', '.field--name-field-topic .field__item');
+    Assert::assertEquals(count($topics), count($topic_elements), sprintf('Expected %d topics in the "Highlighted content" section but found %d topics.', count($topics), count($topic_elements)));
+
+    foreach ($topics as $j => $topic) {
+      /** @var \Behat\Mink\Element\NodeElement $topic_element */
+      $topic_element = array_shift($topic_elements);
+
+      // Check the title of each topic.
+      $actual_topic_title = $topic_element->getText();
+      Assert::assertEquals($topic->label(), $actual_topic_title, sprintf('Expected topic #%d to be "%s" in the "Highlighted content" section but instead found "%s".', $j + 1, $topic->label(), $actual_topic_title));
+
+      // Check that each topic links to their canonical page.
+      $xpath = '/a[@href = "' . $topic->toUrl()->toString() . '"]';
+      Assert::assertNotEmpty($topic_element->find('xpath', $xpath), sprintf('Topic "%s" in the "Highlighted content" section does not link to the canonical topic page.', $actual_topic_title));
+    }
+
+    // Check that the description is present.
+    $actual_description = $block_element->find('css', '.field--name-body')->getText();
+    Assert::assertNotEmpty($actual_description);
+  }
+
 }
diff --git a/tests/src/Context/SolutionContext.php b/tests/src/Context/SolutionContext.php
index d5da167644..63a0bec7ab 100644
--- a/tests/src/Context/SolutionContext.php
+++ b/tests/src/Context/SolutionContext.php
@@ -846,64 +846,4 @@ public function setDownloadCountForEntity(string $type, string $target_entity_la
     $meta_entity->set('count', (int) $count)->save();
   }
 
-  /**
-   * Checks the contents of the "Highlighted solution" block.
-   *
-   * This is shown on the homepage.
-   *
-   * @param string $label
-   *   The label of the solution that is highlighted on the homepage.
-   *
-   * @Then I should see :label as the highlighted solution
-   */
-  public function assertHighlightedSolution(string $label): void {
-    $solution = self::getSolutionByName($label);
-
-    $block_element = $this->getSession()->getPage()->find('css', '.block-entityqueue--highlighted-solution');
-
-    // Check block title.
-    $actual_block_title = $block_element->find('css', 'h2')->getText();
-    Assert::assertEquals('Highlighted solution', $actual_block_title, sprintf('Expected the highlighted solution block to have the title "Highlighted solution" but instead found "%s".', $actual_block_title));
-
-    // Check that the logo is present.
-    if ($logo = $solution->getLogoAsFile()) {
-      $filename = $logo->getFilename();
-      $logo_is_present = self::hasImage($filename, $block_element);
-      Assert::assertTrue($logo_is_present, sprintf('Image with filename "%s" has been found in the highlighted solution block.', $filename));
-    }
-
-    // Check title text.
-    $actual_title = $block_element->find('css', 'article h2')->getText();
-    Assert::assertEquals($solution->label(), $actual_title, sprintf('Expected the highlighted solution to have the title "%s" but instead found "%s".', $solution->label(), $actual_title));
-
-    // Check that title links to the canonical page of the solution.
-    $xpath = '//h2/a[@href = "' . $solution->toUrl()->toString() . '"]';
-    Assert::assertNotEmpty($block_element->find('xpath', $xpath), sprintf('Solution "%s" does not link to the canonical page.', $actual_title));
-
-    // Retrieve the topics from the solution, limiting the result to maximum 2
-    // topics.
-    $topics = array_slice($solution->getTopics(), 0, 2);
-
-    // Check that the correct number of topics are present.
-    $topic_elements = $block_element->findAll('css', '.field--name-field-topic .field__item');
-    Assert::assertEquals(count($topics), count($topic_elements), sprintf('Expected %d topics in the "Highlighted solution" section but found %d topics.', count($topics), count($topic_elements)));
-
-    foreach ($topics as $j => $topic) {
-      /** @var \Behat\Mink\Element\NodeElement $topic_element */
-      $topic_element = array_shift($topic_elements);
-
-      // Check the title of each topic.
-      $actual_topic_title = $topic_element->getText();
-      Assert::assertEquals($topic->label(), $actual_topic_title, sprintf('Expected topic #%d to be "%s" in the "Highlighted solution" section but instead found "%s".', $j + 1, $topic->label(), $actual_topic_title));
-
-      // Check that each topic links to their canonical page.
-      $xpath = '/a[@href = "' . $topic->toUrl()->toString() . '"]';
-      Assert::assertNotEmpty($topic_element->find('xpath', $xpath), sprintf('Topic "%s" in the "Highlighted solution" section does not link to the canonical topic page.', $actual_topic_title));
-    }
-
-    // Check that the description is present.
-    $actual_description = $block_element->find('css', '.field--name-field-is-description')->getText();
-    Assert::assertNotEmpty($actual_description);
-  }
-
 }
diff --git a/web/modules/custom/joinup_event/joinup_event.module b/web/modules/custom/joinup_event/joinup_event.module
index 24142e7306..ab90e1016a 100644
--- a/web/modules/custom/joinup_event/joinup_event.module
+++ b/web/modules/custom/joinup_event/joinup_event.module
@@ -57,9 +57,9 @@ function joinup_event_entity_type_alter(array &$entity_types): void {
 function joinup_event_theme($existing, $type, $theme, $path) {
   return [
     // Use a custom template for the highlighted event on the homepage.
-    'node__event__highlighted' => [
+    'node__event__highlighted_event' => [
       'base hook' => 'node',
-      'template' => 'node--event--highlighted',
+      'template' => 'node--event--highlighted-event',
     ],
   ];
 }
@@ -67,7 +67,7 @@ function joinup_event_theme($existing, $type, $theme, $path) {
 /**
  * Prepares variables for the highlighted event template.
  *
- * Default template: node--event--highlighted.html.twig.
+ * Default template: node--event--highlighted-event.html.twig.
  *
  * The highlighted event is displayed on the homepage and is managed through an
  * entityqueue. It has a number of additional fields (header text and a call to
@@ -81,7 +81,7 @@ function joinup_event_theme($existing, $type, $theme, $path) {
  * @see hook_entity_type_build()
  * @see \Drupal\Core\Field\BaseFieldDefinition::setDisplayConfigurable()
  */
-function template_preprocess_node__event__highlighted(array &$variables) {
+function joinup_event_preprocess_node__event__highlighted_event(array &$variables) {
   /** @var \Drupal\node\NodeInterface $node */
   $node = $variables['node'];
 
diff --git a/web/modules/custom/joinup_event/templates/node--event--highlighted.html.twig b/web/modules/custom/joinup_event/templates/node--event--highlighted-event.html.twig
similarity index 100%
rename from web/modules/custom/joinup_event/templates/node--event--highlighted.html.twig
rename to web/modules/custom/joinup_event/templates/node--event--highlighted-event.html.twig
diff --git a/web/themes/ventuno/src/scss/components/_highlighted-solution-block.scss b/web/themes/ventuno/src/scss/components/_highlighted-content-block.scss
similarity index 66%
rename from web/themes/ventuno/src/scss/components/_highlighted-solution-block.scss
rename to web/themes/ventuno/src/scss/components/_highlighted-content-block.scss
index ae10fd3edb..9d56282de8 100644
--- a/web/themes/ventuno/src/scss/components/_highlighted-solution-block.scss
+++ b/web/themes/ventuno/src/scss/components/_highlighted-content-block.scss
@@ -1,5 +1,5 @@
-// Highlighted Solution
-.block-entityqueue--highlighted-solution {
+// Highlighted Content
+.block-entityqueue--highlighted-content {
   @extend .pb-5;
   border-bottom: 1px solid rgba($primary, .1);
   position: relative;
@@ -17,18 +17,13 @@
     @include font-icon-after("\E801", 1rem);
   }
   article {
-    .field--name-field-is-logo {
+    .logo {
       @extend .mb-4;
     }
-    .field--name-field-is-description {
+    .description {
       color: $gray-700;
     }
-    .field--name-field-is-solution-type {
-      color: $gray-500;
-      @extend .mt-2;
-      @extend .fs-xs;
-    }
-    .field--name-field-topic {
+    .topics {
       a {
         border-radius: $border-radius-pill;
         padding-right: $spacer; // 16px
@@ -36,4 +31,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/web/themes/ventuno/src/scss/components/_homepage.scss b/web/themes/ventuno/src/scss/components/_homepage.scss
index 4c41c34a14..0d40ae4a51 100644
--- a/web/themes/ventuno/src/scss/components/_homepage.scss
+++ b/web/themes/ventuno/src/scss/components/_homepage.scss
@@ -21,7 +21,7 @@
   }
 }
 .view-in-the-spotlight,
-.block-entityqueue--highlighted-solution,
+.block-entityqueue--highlighted-content,
 .view-latest-news {
   .views-row {
     @extend .mb-4;
diff --git a/web/themes/ventuno/src/scss/homepage.scss b/web/themes/ventuno/src/scss/homepage.scss
index 0791e76be8..83a2a2d566 100644
--- a/web/themes/ventuno/src/scss/homepage.scss
+++ b/web/themes/ventuno/src/scss/homepage.scss
@@ -15,7 +15,7 @@
 @import "components/in-the-spotlight-block";
 @import "components/latest-news-block";
 @import "components/navbar";
-@import "components/highlighted-solution-block";
+@import "components/highlighted-content-block";
 @import "components/highlighted-event-block";
 @import "components/global-search-block";
 @import "components/explore-block";
diff --git a/web/themes/ventuno/templates/block/block--entityqueue-block--highlighted-solution.html.twig b/web/themes/ventuno/templates/block/block--entityqueue-block--highlighted-content.html.twig
similarity index 92%
rename from web/themes/ventuno/templates/block/block--entityqueue-block--highlighted-solution.html.twig
rename to web/themes/ventuno/templates/block/block--entityqueue-block--highlighted-content.html.twig
index 2ecd30c2e2..aafac3d953 100644
--- a/web/themes/ventuno/templates/block/block--entityqueue-block--highlighted-solution.html.twig
+++ b/web/themes/ventuno/templates/block/block--entityqueue-block--highlighted-content.html.twig
@@ -41,7 +41,9 @@
   {% endif %}
   {{ title_suffix }}
   {% block content %}
-    <a href="{{ path('view.search.page_1', {}, {query: {f: ['type:solution']}}) }}" class="more-link">{{ 'More solutions'|t }}</a>
+    {% if related_content %}
+      {{ related_content }}
+    {% endif %}
     {{ content }}
   {% endblock %}
 </div>
diff --git a/web/themes/ventuno/templates/content/node--highlighted.html.twig b/web/themes/ventuno/templates/content/node--highlighted.html.twig
new file mode 100644
index 0000000000..ea5ed7ce95
--- /dev/null
+++ b/web/themes/ventuno/templates/content/node--highlighted.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Template for a highlighted node.
+ *
+ * This is used in the "Highlighted content" block on the homepage.
+ */
+#}
+<article{{ attributes }}>
+  <div class="logo">{{ node.getLogoAsRenderArray('highlighted') }}</div>
+  <div class="topics">{{ content.field_topic }}</div>
+  {{ title_prefix }}
+  {% if not page and not is_label_hidden %}
+    <h2{{ title_attributes }}>
+      <a href="{{ url }}" rel="bookmark">{{ label }}</a>
+    </h2>
+  {% endif %}
+  {{ title_suffix }}
+  <div class="description">{{ content.body }}</div>
+</article>
diff --git a/web/themes/ventuno/ventuno.theme b/web/themes/ventuno/ventuno.theme
index 4c9496b51e..4e163e9c46 100644
--- a/web/themes/ventuno/ventuno.theme
+++ b/web/themes/ventuno/ventuno.theme
@@ -15,6 +15,8 @@ use Drupal\joinup_bundle_class\LogoInterface;
 use Drupal\joinup_collection\JoinupCollectionHelper;
 use Drupal\rdf_entity\Entity\Rdf;
 use Drupal\smart_trim\Truncate\TruncateHTML;
+use Drupal\topic\Entity\TopicInterface;
+use Drupal\topic\Entity\TopicReferencingEntityInterface;
 
 /**
  * Implements hook_theme_suggestions_HOOK_alter().
@@ -137,6 +139,43 @@ function ventuno_preprocess_page(&$variables) {
   $variables['anonymous_links'] = $anonymous_links;
 }
 
+/**
+ * Implements hook_preprocess_block() for the highlighted content block.
+ *
+ * Add a link to related content in the Highlighted Content block which is shown
+ * on the homepage. This will lead to the search page with the results filtered
+ * by the first referenced topic. If no topics are referenced the link will be
+ * hidden.
+ */
+function ventuno_preprocess_block__entityqueue_block__highlighted_content(&$variables) {
+  /** @var \Drupal\node\NodeInterface $node */
+  $node = $variables['elements']['content']['entities'][0]['#node'] ?? NULL;
+
+  if ($node instanceof TopicReferencingEntityInterface) {
+    $topics = $node->getTopics();
+    $topic = reset($topics);
+
+    if ($topic instanceof TopicInterface) {
+      $options = [
+        'query' => [
+          'f' => [
+            'type:' . $node->bundle(),
+            'topic:' . $topic->id(),
+          ],
+        ],
+      ];
+      $variables['related_content'] = [
+        '#type' => 'link',
+        '#title' => t('Related content'),
+        '#url' => Url::fromRoute('view.search.page_1', [], $options),
+        '#attributes' => [
+          'class' => ['more-link'],
+        ],
+      ];
+    }
+  }
+}
+
 /**
  * Implements hook_preprocess_HOOK().
  *