diff --git a/.github/workflows/workflowhub.yml b/.github/workflows/workflowhub.yml
new file mode 100644
index 00000000000000..58693007acd5b4
--- /dev/null
+++ b/.github/workflows/workflowhub.yml
@@ -0,0 +1,54 @@
+name: "[Cron] Upload workflows to (DEV)WorkflowHub"
+
+on:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    # We'll run this daily at noon.
+    - cron:  '59 12 * * *'
+  workflow_dispatch:
+
+jobs:
+  runner-job:
+    if: github.repository_owner == 'galaxyproject'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 200
+
+      # BEGIN Dependencies
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.11'
+          architecture: 'x64'
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.1"
+      - uses: actions/cache@v2
+        with:
+          path: |
+            vendor/bundle
+            ~/.npm
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-node-
+            ${{ runner.os }}-gems-
+      - name: Install dependencies
+        run: |
+          gem install bundler
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+          bundle pristine ffi
+      # END Dependencies
+
+      # Required to build the RO-Crates
+      - name: Build Site
+        run: |
+          JEKYLL_ENV=production bundle exec jekyll build --strict_front_matter -d _site/training-material
+
+      - name: Upload workflows
+        run: |
+          python bin/wfh-upload.py
+        env:
+          DEV_WFH_TOKEN: ${{ secrets.DEV_WFH_TOKEN }}
diff --git a/ORGANISATIONS.yaml b/ORGANISATIONS.yaml
index 777f3aaf442a43..4817d2975d7121 100644
--- a/ORGANISATIONS.yaml
+++ b/ORGANISATIONS.yaml
@@ -19,16 +19,19 @@ avans-atgm:
     joined: 2020-11
     url: https://avans.nl
     avatar: "/training-material/shared/images/logo-avans.png"
+    ror: "015d5s513"
 
 carpentries:
     name: The Carpentries
     joined: 2021-09
+    ror: "0356fgm10"
 
 earlham:
     name: Earlham Institute
     joined: 2017-09
     url: https://www.earlham.ac.uk/
     avatar: "/training-material/shared/images/earlham_logo.svg"
+    ror: "018cxtf62"
 
 edctp:
     name: EDCTP
@@ -36,18 +39,21 @@ edctp:
     url: https://www.edctp.org/
     avatar: "/training-material/shared/images/edctp.jpg"
     github: false
+    ror: "031jv9v19"
 
 egi:
     name: EGI
     url: https://www.egi.eu/
     avatar: https://cdn.egi.eu/app/uploads/2021/11/egi-logo.svg
     github: false
+    ror: "052jj4m32"
 
 elixir-europe:
     name: ELIXIR Europe
     joined: 2017-09
     url: https://elixir-europe.org
     avatar: "/training-material/shared/images/elixir.png"
+    ror: "044rwnt51"
 
 elixir-goblet-ttt:
     name: ELIXIR Goblet Train the Trainers
@@ -61,6 +67,7 @@ embl-ebi:
     url: https://www.ebi.ac.uk
     avatar: https://raw.githubusercontent.com/nomadscientist/scrnaseq_training/d0fccaa9dc8dc8615eb7146d6c5e96bd36f11f3a/EMBL_EBI_Logo_black.svg
     github: false
+    ror: "02catss52"
 
 erasmusmc:
     name: ErasmusMC
@@ -68,12 +75,14 @@ erasmusmc:
     url: https://www.erasmusmc.nl
     avatar: "/training-material/shared/images/logo-erasmusmc.png"
     github: false
+    ror: "018906e22"
 
 eu:
     name: The European Union
     url: https://european-union.europa.eu
     avatar: "/training-material/shared/images/EU-logo.jpg"
     github: false
+    ror: "019w4f821"
 
 find:
     name: FIND
@@ -81,23 +90,27 @@ find:
     url: https://www.finddx.org/
     avatar: "/training-material/shared/images/FIND.png"
     github: false
+    ror: "05tcsqz68"
 
 ifb:
     name: Institut Français de Bioinformatique
     url: https://www.france-bioinformatique.fr/
     avatar: "/training-material/shared/images/ifb.png"
     github: false
+    ror: "045f7pv37"
 
 inab-certh:
     name: INAB|CERTH
     url: "https://www.inab.certh.gr/"
     avatar: "/training-material/shared/images/inab-certh.png"
+    ror: "03bndpq63"
 
 irccs:
     name: IRCCS Ospedale San Raffaele
     url: "https://www.hsr.it/"
     avatar: "/training-material/shared/images/irccs.jpg"
     github: false
+    ror: "039zxt351"
 
 jetstream2:
     name: JetStream
@@ -110,6 +123,7 @@ johnshopkins:
     url: "https://www.jhu.edu/"
     avatar: "/training-material/shared/images/hopkins.png"
     github: false
+    ror: "00za53h95"
 
 linq:
   name: LINQ
@@ -123,17 +137,20 @@ minnesotauni:
     url:  "https://twin-cities.umn.edu/"
     avatar: "/training-material/shared/images/minnesotauni.png"
     github: false
+    ror: "017zqws13"
 
 MPIIE:
     name: Max Planck Institute of Immunology and Epigenetics
     url: https://www.ie-freiburg.mpg.de
     avatar: https://raw.githubusercontent.com/bgruening/presentations/master/shared/resources/img/14_MPI_IE_logo_mit_180.gif
     github: false
+    ror: "058xzat49"
 
 ncbi:
     name: National Center for Biotechnology Information
     url: "https://www.ncbi.nlm.nih.gov/"
     avatar: "/training-material/shared/images/ncbi.png"
+    ror: "02meqm098"
 
 panacea:
     name: PanACEA
@@ -153,6 +170,7 @@ petermac:
     name: Peter MacCallum Cancer Centre
     url: "https://www.petermac.org/"
     avatar: "/training-material/shared/images/petermac.png"
+    ror: "02a8bt934"
 
 pndb:
     name: Pôle National de Données de Biodiversité
@@ -165,36 +183,42 @@ psu:
     url: http://www.psu.edu
     avatar: "/training-material/shared/images/psu.png"
     github: false
+    ror: "04p491231"
 
 qiime2:
     name: QIIME2
     url: https://qiime2.org/
     avatar: https://avatars.githubusercontent.com/u/18176583?s=200&v=4
 
+
 sanbi:
     name: SANBI/UWC
     url: https://www.sanbi.org/
     avatar: "/training-material/shared/images/sanbi.png"
     description: "South African National Bioinformatics Institute, University of the Western Cape"
     github: false
+    ror: "005r3tp02"
 
 san-raffaele-uni:
     name: Università Vita-Salute San Raffaele
     url: "https://www.unisr.it/"
     avatar: "/training-material/shared/images/uni_san_raffaele.svg"
     github: false
+    ror: "01gmqr298"
 
 sciensano:
   name: Sciensano
   url: "https://www.sciensano.be"
   avatar: "/training-material/shared/images/sciensano.jpg"
   github: false
+  ror: "04ejags36"
 
 swiss-tph:
     name: Swiss Tropical and Public Health Institute
     url: https://www.swisstph.ch/en/
     avatar: "/training-material/shared/images/swiss-tph.png"
     github: false
+    ror: "03adhka07"
 
 tb-capt:
     name: TB-CAPT
@@ -207,23 +231,25 @@ uga:
     url: https://www.univ-grenoble-alpes.fr/
     avatar: /training-material/shared/images/logo-uga.svg
     github: false
+    ror: "02rx3b187"
 
 uni-freiburg:
     name: University of Freiburg
     url: https://www.uni-freiburg.de/
     avatar: https://raw.githubusercontent.com/bgruening/presentations/a2e38e4b007994af798320db3a0131c4bb891c0e/shared/resources/img/logo_freiburg.jpg
     github: false
+    ror: "0245cg223"
 
 UTas:
     name: University of Tasmania
     url: https://www.utas.edu.au/
     avatar: "/training-material/shared/images/UTas_logo.png"
     github: false
+    ror: "01nfmeh72"
 
 vib:
     name: Vlaams Instituut voor Biotechnologie
     url: https://vib.be/
     avatar: "/training-material/shared/images/logo-vib.png"
     github: false
-
-
+    ror: "03xrhmk39"
diff --git a/_config.yml b/_config.yml
index b8c6e4a1ddf5b6..457902b1243e9b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -158,6 +158,7 @@ icon-tag:
   galaxy-tags: fas fa-tags
   galaxy-toggle: fas fa-toggle-on
   galaxy-upload: fas fa-upload
+  galaxy-download: fas fa-download
   galaxy-wf-connection: fas fa-arrows-alt-h
   galaxy-wf-edit: fa fa-edit
   galaxy-wf-new: fas fa-plus
diff --git a/_layouts/base_slides.html b/_layouts/base_slides.html
index 8c404aebe405fc..73d5274023dc94 100644
--- a/_layouts/base_slides.html
+++ b/_layouts/base_slides.html
@@ -40,8 +40,8 @@
         {%- elsif page.tags contains "galaxy" %}{% assign coverimage = "/assets/images/GalaxyNews.png" %}
         {%- elsif page.tags contains "gat" %}{% assign coverimage = "/assets/images/gat.png" %}
         {%- else %}{% assign coverimage = "/assets/images/GTNLogo1000.png" %}{% endif %}
-        {% assign og_image = page.og_image | default: coverimage | default: topic.og_image | default: "/assets/images/GTNLogo1000.png" %}
-        <meta property="og:image" content="{{ og_image | prepend: site.baseurl }}">
+        {% assign og_image = page.og_image | default: page['cover-image'] | default: topic.og_image | default: coverimage | default: "assets/images/GTNLogo1000.png" %}
+	<meta property="og:image" content="{% if og_image contains 'https://' %}{{ og_image }}{% else %}{{ site.url }}{{ site.baseurl }}/{{ og_image }}{% endif %}">
 
         <script type="application/ld+json">
             {% include _includes/material.jsonld material=page topic=topic site=site %}
diff --git a/_layouts/contributor_index.html b/_layouts/contributor_index.html
index 5ec4ab0f72fd3f..4d9e844fde9e82 100644
--- a/_layouts/contributor_index.html
+++ b/_layouts/contributor_index.html
@@ -254,6 +254,14 @@ <h2>External Links</h2>
 				</div>
 				{% endif %}
 
+				{% if entity.ror %}
+				<div class="contact-items">
+					<a title="ROR" href="https://ror.org/{{ entity.ror }}">
+						ROR:{{ entity.ror }}
+					</a>
+				</div>
+				{% endif %}
+
 				{% if entity.github != false %}
 				<div class="contact-items">
 					<a title="GitHub" href="https://github.com/{{ page.contributor }}">
diff --git a/_layouts/workflow.html b/_layouts/workflow.html
new file mode 100644
index 00000000000000..11ead822106762
--- /dev/null
+++ b/_layouts/workflow.html
@@ -0,0 +1,197 @@
+---
+layout: base
+---
+
+{% assign material = page.material %}
+{% assign workflow = page.workflow %}
+
+<style>
+hgroup {margin-bottom: 2rem; border-bottom: 1px solid var(--border-light);}
+hgroup p { font-family: monospace; font-size: 0.8rem;}
+.meta ul { padding-left: 1em;}
+</style>
+
+<section>
+	<hgroup>
+		<h1 data-toc-skip>{{ workflow.title }}</h1>
+		<p>{{ workflow.wfid }}/{{ workflow.wfname }}</p>
+	</hgroup>
+	{% if workflow.annotation %}
+	<p>{{ workflow.annotation }}</p>
+	{% endif %}
+	<div class="row">
+		<div class="col-md-3 meta">
+			{% if workflow.creators %}
+			<b>Author(s)</b>
+			<br/>
+			{% for entity in workflow.creators %}
+			{{ entity.name }}{% if forloop.last == false %}, {% endif %}
+			{% endfor %}
+			{% endif %}
+			<br/>
+
+			{% icon version %}
+			<b>Version</b>
+			<br/>
+			{{ workflow.version }}
+
+			<br/>
+
+			{% icon last_modification %}
+			<b>Last updated</b>
+			<br/>
+			{{ workflow.path | gtn_mod_date | date: "%b %-d, %Y" }}
+
+			<br/>
+
+			{% icon license %}
+			<b>License</b>
+			<br/>
+
+			{% if workflow.license %}
+			<a href="https://spdx.org/licenses/{{ workflow.license }}">{{ workflow.license }}</a>
+			{% else %}
+			None Specified, defaults to
+			<a href="https://spdx.org/licenses/CC-BY-4.0">CC-BY-4.0</a>
+			{% endif %}
+			<br/>
+
+			{% if workflow.tags %}
+			{% icon galaxy-tags %}
+			<b>Tags</b>
+			<br/>
+
+			{% for tag in workflow.tags %}
+			<div class="label label-default tutorial_tag" style="{{ tag | colour_tag }}">{{ tag }}</div>
+			{% endfor %}
+			</br>
+			{% endif %}
+
+
+			<b>Features</b>
+			<ul>
+			{% if workflow.features.tests %}
+				<li>Includes <a href="https://training.galaxyproject.org/training-material/faqs/gtn/workflow_run_test.html">Galaxy Workflow Tests</a></li>
+			{% endif %}
+			{% if workflow.features.report %}
+				<li>Includes a <a href="https://training.galaxyproject.org/training-material/faqs/galaxy/workflows_report_view.html">Galaxy Workflow Report</a></li>
+			{% endif %}
+			{% if workflow.features.comments %}
+				<li>Uses <a href="https://training.galaxyproject.org/training-material/faqs/galaxy/workflows_comments.html">Galaxy Workflow Comments</a></li>
+			{% endif %}
+			{% if workflow.features.subworkflows %}
+				<li>Uses <a href="https://training.galaxyproject.org/training-material/faqs/galaxy/workflows_subworkflows.html">subworkflows</a></li>
+			{% endif %}
+			</ul>
+
+			<hr/>
+
+
+			<b>Tutorial</b>
+			<br/>
+			{% icon hands_on %} <a href="../tutorial.html">{{ material.title }}</a>
+			</br>
+
+			{% assign workflow_count = material.workflows | size %}
+			{% if workflow_count > 1 %}
+			{% icon workflow %} <a href="index.html">Other workflows associated with this material</a>
+			{% endif %}
+
+
+			<hr/>
+			<b>Workflow Testing</b>
+			<br/>
+
+			Tests: {% if workflow.tests %}✅{% else %}❌{% endif %} <br/>
+			Results: {% if workflow.test_results == nil %}Not yet automated{% endif %}
+
+			<hr/>
+
+			<b>FAIRness</b>
+
+			{% icon purl %}
+			<b><abbr title="Persistent URL">PURL</abbr></b>
+			<br/>
+			<a href="https://gxy.io/GTN:{{ page.short_id }}">https://gxy.io/GTN:{{ page.short_id }}</a>
+			<br/>
+
+			{% if jekyll.environment == "production" %}
+			<a style="margin-bottom: 0.2rem" href="{{ site.baseurl }}/api/workflows/{{ material.topic_id }}/{{ material.tutorial_id }}/{{ workflow.wfid }}/rocrate.zip" class="btn btn-secondary"><img src="{% link assets/images/ro-crate.png %}" style="height: 32px" alt="RO-Crate logo with flask"/> Download Workflow RO-Crate</a>
+			{% endif %}
+			{% if workflow.workflowhub_id %}
+			<a style="margin-bottom: 0.2rem" href="https://workflowhub.eu/workflows/{{ workflow.workflowhub_id }}" class="btn btn-secondary"><img src="{% link assets/images/workflowhub-icon.svg %}" style="height: 32px" alt="Workflowhub cloud with gears logo"/> View on WorkflowHub</a>
+			{% endif %}
+
+		</div>
+		<div class="col-md-9">
+			<span tabindex="0" role="button" class="workflow show-when-galaxy-proxy-active" data-workflow="{{ workflow.trs_endpoint }}">Launch in Tutorial Mode</span>
+			<a href="{% link faqs/galaxy/tutorial_mode.md %}" class="show-when-galaxy-proxy-active">{% icon question %}</a>
+			<br/>
+
+			<span class="dropdown">
+				<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+					<img src="{% link assets/images/galaxylogo.png %}" style="height: 16px" alt="galaxy logo"/> 
+					Run Workflow in Galaxy
+				</button>
+				<ul class="dropdown-menu">
+					{% assign servers = nil | list_usegalaxy_servers_shuffle %}
+					{% for server in servers %}
+					<li class="dropdown-item"><a href="{{ server.url }}/workflows/trs_import?run_form=true&trs_url={{ workflow.trs_endpoint }}">{{ server.human }}</a></li>
+					{% endfor %}
+					<li class="dropdown-item hide-when-galaxy-proxy-active">
+						<a href="https://my.galaxy.training/?path=/workflows/trs_import%3Frun_form=true%26trs_url={{ workflow.trs_endpoint }}">Import to another server (≥23.0+ only!)</a>
+					</li>
+				</ul>
+			</span>
+			<a class="btn btn-primary" href="{{ site.url }}{{ site.baseurl }}/{{ workflow.path }}">
+				{% icon galaxy-download %}
+				Download
+			</a>
+			<pre class="mermaid">{{ workflow.mermaid }}</pre>
+
+			<p>To use these workflows in Galaxy you can either click the links to download the workflows, or you can right-click and copy the link to the workflow which can be used in the Galaxy form to import workflows.</p>
+
+
+			<h2>Importing into Galaxy</h2>
+			Below are the instructions for importing these workflows directly into your Galaxy server of choice to start using them!
+
+			{% snippet faqs/galaxy/workflows_import.md box_type="hands_on" %}
+
+			<h2>Version History</h2>
+			<table class="table table-striped">
+				<thead>
+					<tr>
+						<th>Version</th>
+						<th>Commit</th>
+						<th>Time</th>
+						<th>Comments</th>
+					</tr>
+				</thead>
+				<tbody>
+					{% for version in workflow.history %}
+					<tr>
+						<td>{{ version.num }}</td>
+						<td><a href="{{ site.github_repository }}/commit/{{ version.hash }}">{{ version.short_hash }}</a></td>
+						<td>{{ version.unix |unix_time_to_date }}</td>
+						<td>{{ version.message }}</td>
+					</tr>
+					{% endfor %}
+				</tbody>
+			</table>
+
+
+			<h2>For Admins</h2>
+			<h3>Installing the workflow tools</h3>
+
+			<pre>
+wget {{ site.url }}{{ site.baseurl }}/{{ workflow.path }} -O workflow.ga
+workflow-to-tools -w workflow.ga -o tools.yaml
+shed-tools install -g GALAXY -a API_KEY -t tools.yaml
+workflow-install -g GALAXY -a API_KEY -w workflow.ga --publish-workflows
+			</pre>
+		</div>
+	</div>
+</section>
+
+
+</section>
diff --git a/_plugins/api.rb b/_plugins/api.rb
index e2d3158ab34e0f..d94ac92034f8ba 100644
--- a/_plugins/api.rb
+++ b/_plugins/api.rb
@@ -6,6 +6,7 @@
 require './_plugins/gtn/metrics'
 require './_plugins/gtn/scholar'
 require './_plugins/gtn/git'
+require './_plugins/gtn/ro-crate'
 require './_plugins/gtn'
 
 ##
@@ -352,11 +353,6 @@ def generate(site)
 Jekyll::Hooks.register :site, :post_write do |site|
   # No need to run this except in prod.
   if Jekyll.env == 'production'
-    # Import on-demand
-    require 'securerandom'
-    require 'zip'
-
-    dir = File.join(site.dest, 'api', 'workflows')
 
     # Public tool listing: reorganised
     if site.data['public-server-tools'] && site.data['public-server-tools']['tools']
@@ -414,133 +410,21 @@ def generate(site)
       end
     end
 
+    # Import on-demand
+    require 'securerandom'
+
 
+    dir = File.join(site.dest, 'api', 'workflows')
     # ro-crate-metadata.json
+    crate_start = Time.now
+    count = 0
     TopicFilter.list_all_materials(site).select { |m| m['workflows'] }.each do |material|
       material['workflows'].each do |workflow|
-        wfid = workflow['wfid']
-        wfname = workflow['wfname']
-        # {"workflow"=>"galaxy-workflow-mouse_novel_peptide_analysis.ga",
-        # "tests"=>false,
-        # "url"=>
-        # "http://0.0.0.0:4002/training-material/topics/.../workflows/galaxy-workflow-mouse_novel_peptide_analysis.ga",
-        # "path"=>
-        # "topics/proteomics/tutorials/.../galaxy-workflow-mouse_novel_peptide_analysis.ga",
-        # "wfid"=>"proteomics-proteogenomics-novel-peptide-analysis",
-        # "wfname"=>"galaxy-workflow-mouse_novel_peptide_analysis",
-        # "trs_endpoint"=>
-        # "http://0.0.0.0:4002/training-material/api/.../versions/galaxy-workflow-mouse_novel_peptide_analysis",
-        # "license"=>nil,
-        # "creators"=>[],
-        # "name"=>"GTN Proteogemics3 Novel Peptide Analysis",
-        # "test_results"=>nil,
-        # "modified"=>2023-06-07 12:09:36.12 +0200}
-
-        wfdir = File.join(dir, wfid, wfname)
-        FileUtils.mkdir_p(wfdir)
-        path = File.join(wfdir, 'ro-crate-metadata.json')
-        Jekyll.logger.debug "[GTN/API/WFRun] Writing #{path}"
-
-        uuids = workflow['creators'].map do |c|
-          if c.key?('identifier') && !c['identifier'].empty?
-            "https://orcid.org/#{c['identifier']}"
-          else
-            "##{SecureRandom.uuid}"
-          end
-        end
-        author_uuids = uuids.map { |u| { '@id' => u.to_s } }
-        author_linked = workflow['creators'].map.with_index do |c, i|
-          {
-            '@id' => (uuids[i]).to_s,
-            '@type' => c['class'],
-            'name' => c['name'],
-          }
-        end
-        license = workflow['license'] ? "https://spdx.org/licenses/#{workflow['license']}" : 'https://spdx.org/licenses/CC-BY-4.0'
-
-        crate = {
-          '@context' => 'https://w3id.org/ro/crate/1.1/context',
-          '@graph' => [
-            # {
-            #   '@id': './',
-            #   '@type': 'Dataset',
-            #   datePublished: workflow['modified'],
-            # },
-            {
-              '@id': 'ro-crate-metadata.json',
-              '@type': 'CreativeWork',
-              about: {
-                '@id': './'
-              },
-              conformsTo: [
-                {
-                  '@id': 'https://w3id.org/ro/crate/1.1'
-                },
-                {
-                  '@id': 'https://about.workflowhub.eu/Workflow-RO-Crate/'
-                }
-              ]
-            },
-            {
-              '@id': './',
-              '@type': 'Dataset',
-              datePublished: workflow['modified'].strftime('%Y-%m-%dT%H:%M:%S.%L%:z'),
-              # hasPart: [
-              #   {
-              #     '@id': '#assembly-assembly-quality-control'
-              #   }
-              # ],
-              mainEntity: {
-                '@id': "#{wfname}.ga"
-              }
-            },
-            {
-              '@id': "#{wfname}.ga",
-              '@type': %w[
-                File
-                SoftwareSourceCode
-                ComputationalWorkflow
-              ],
-              author: author_uuids,
-              license: {
-                '@id': license,
-              },
-              name: workflow['name'],
-              version: Gtn::ModificationTimes.obtain_modification_count(workflow['path']),
-              programmingLanguage: {
-                '@id': 'https://w3id.org/workflowhub/workflow-ro-crate#galaxy'
-              }
-            },
-            {
-              '@id': license,
-              '@type': 'CreativeWork',
-              name: workflow['license'],
-            },
-            {
-              '@id': 'https://w3id.org/workflowhub/workflow-ro-crate#galaxy',
-              '@type': 'ComputerLanguage',
-              identifier: {
-                '@id': 'https://galaxyproject.org/'
-              },
-              name: 'Galaxy',
-              url: {
-                '@id': 'https://galaxyproject.org/'
-              },
-              version: '23.1'
-            }
-          ]
-        }
-        crate['@graph'] += author_linked
-        File.write(path, JSON.pretty_generate(crate))
-
-        zip_path = File.join(wfdir, 'rocrate.zip')
-        Zip::File.open(zip_path, create: true) do |zipfile|
-          # - The name of the file as it will appear in the archive
-          # - The original file, including the path to find it
-          zipfile.add('ro-crate-metadata.json', path)
-          zipfile.add("#{wfname}.ga", workflow['path'])
-        end
+        Gtn::RoCrate.write(site, dir, material, workflow, site.config['url'], site.config['baseurl'])
+        count += 1
       end
     end
+
+    Jekyll.logger.debug "[GTN/API/WFRun] RO-Crate Metadata written in #{Time.now - crate_start} seconds for #{count} workflows"
   end
 end
diff --git a/_plugins/generator-workflows.rb b/_plugins/generator-workflows.rb
new file mode 100644
index 00000000000000..eb60cd5f9118a9
--- /dev/null
+++ b/_plugins/generator-workflows.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require './_plugins/gtn'
+
+module Jekyll
+  ##
+  # This class generates the GTN's author pags
+  class WorkflowPageGenerator < Generator
+    safe true
+
+    ##
+    # This generates the recording pages, where needed.
+    # Params
+    # +site+:: The site object
+    def generate(site)
+      Jekyll.logger.info "[GTN/Workflows] Generating workflow pages"
+      materials = TopicFilter
+        .list_all_materials(site)
+
+      # [{"workflow"=>"Calling_variants_in_non-diploid_systems.ga",
+      #   "tests"=>true,
+      #   "url"=>"https://training.galaxyproject.org/training-material/topics/variant-analysis/tutorials/non-dip/workflows/Calling_variants_in_non-diploid_systems.ga",
+      #   "path"=>"topics/variant-analysis/tutorials/non-dip/workflows/Calling_variants_in_non-diploid_systems.ga",
+      #   "wfid"=>"variant-analysis-non-dip",
+      #   "wfname"=>"calling-variants-in-non-diploid-systems",
+      #   "trs_endpoint"=>"https://training.galaxyproject.org/training-material/api/ga4gh/trs/v2/tools/variant-analysis-non-dip/versions/calling-variants-in-non-diploid-systems",
+      #   "license"=>nil,
+      #   "parent_id"=>"variant-analysis/non-dip",
+      #   "topic_id"=>"variant-analysis",
+      #   "tutorial_id"=>"non-dip",
+      #   "creators"=>[],
+      #   "name"=>"Calling variants in non-diploid systems",
+      #   "title"=>"Calling variants in non-diploid systems",
+      #   "test_results"=>nil,
+      #   "modified"=>2024-03-18 12:38:46.293831071 +0100,
+      #   "mermaid"=>
+      #   "graph_dot"=>
+      # }]
+      # /api/workflows/#{topic_id}/#{tutorial_id}/#{wfid}/rocrate.zip
+      shortlinks = site.data['shortlinks']['id'].invert
+
+      materials.each do |material|
+        (material['workflows'] || []).each do |workflow|
+          page2 = PageWithoutAFile.new(site, '', '', "#{workflow['path'].gsub(/.ga$/, '.html')}")
+          path = File.join('/', workflow['path'].gsub(/.ga$/, '.html'))
+          page2.content = nil
+          page2.data['layout'] = 'workflow'
+          page2.data['material'] = material
+          page2.data['workflow'] = workflow
+          page2.data['js_requirements'] = {'mathjax' => false, 'mermaid' => true}
+          page2.data['short_id'] = shortlinks[path]
+          site.pages << page2
+        end
+      end
+    end
+  end
+end
+
diff --git a/_plugins/gtn.rb b/_plugins/gtn.rb
index ea45b8b0eb0a24..d58671865d07a5 100644
--- a/_plugins/gtn.rb
+++ b/_plugins/gtn.rb
@@ -4,6 +4,7 @@
 require './_plugins/gtn/contributors'
 require './_plugins/gtn/boxify'
 require './_plugins/gtn/mod'
+require './_plugins/gtn/ro-crate'
 require './_plugins/gtn/images'
 require './_plugins/gtn/synthetic'
 require './_plugins/gtn/metrics'
@@ -710,6 +711,10 @@ def shuffle(array)
       array.shuffle
     end
 
+    def unix_time_to_date(time)
+      Time.at(time.to_i).strftime('%Y-%m-%d %H:%M:%S')
+    end
+
     def is_date_passed(date)
       if date.nil?
         false
diff --git a/_plugins/gtn/ro-crate.rb b/_plugins/gtn/ro-crate.rb
new file mode 100644
index 00000000000000..60407464a5196d
--- /dev/null
+++ b/_plugins/gtn/ro-crate.rb
@@ -0,0 +1,210 @@
+# frozen_string_literal: true
+require 'zip'
+
+
+module Gtn
+  # Parse the git repo to get some facts
+  module RoCrate
+    GLOBAL_WORKFLOW_OFFSET = 0
+
+    def self.cache
+      @@cache ||= Jekyll::Cache.new('RoCrate')
+    end
+
+    def self.name2md(site, name)
+      return %Q([#{Gtn::Contributors.fetch_name(site, name)}](https://training.galaxyproject.org/training-material/hall-of-fame/#{name}/))
+    end
+
+    def self.write(site, dir, associated_material, workflow, url, baseurl, time_based_version: false)
+      wfname = workflow['wfname']
+      # {"workflow"=>"galaxy-workflow-mouse_novel_peptide_analysis.ga",
+      # "tests"=>false,
+      # "url"=>
+      # "http://0.0.0.0:4002/training-material/topics/.../workflows/galaxy-workflow-mouse_novel_peptide_analysis.ga",
+      # "path"=>
+      # "topics/proteomics/tutorials/.../galaxy-workflow-mouse_novel_peptide_analysis.ga",
+      # "wfid"=>"proteomics-proteogenomics-novel-peptide-analysis",
+      # "wfname"=>"galaxy-workflow-mouse_novel_peptide_analysis",
+      # "trs_endpoint"=>
+      # "http://0.0.0.0:4002/training-material/api/.../versions/galaxy-workflow-mouse_novel_peptide_analysis",
+      # "license"=>nil,
+      # "creators"=>[],
+      # "name"=>"GTN Proteogemics3 Novel Peptide Analysis",
+      # "test_results"=>nil,
+      # "modified"=>2023-06-07 12:09:36.12 +0200}
+
+      wfdir = File.join(dir, workflow['topic_id'], workflow['tutorial_id'], wfname)
+      FileUtils.mkdir_p(wfdir)
+      path = File.join(wfdir, 'ro-crate-metadata.json')
+      Jekyll.logger.debug "[GTN/API/WFRun] Writing #{path}"
+      # We have the `dot` graph code in a variable, we need to pass it to `dot -T png ` on the stdin
+      dot_path = File.join(wfdir, "graph.dot")
+      File.write(dot_path, workflow['graph_dot'])
+      Jekyll.logger.debug "[GTN/API/WFRun] dot -T png #{dot_path} > graph.png"
+      `dot -T png '#{dot_path}' > '#{File.join(wfdir, 'graph.png')}'`
+
+      # Our new workflow IDs
+      wfurlid = url + baseurl + '/' + workflow['path'].gsub(/.ga$/, '.html')
+
+      uuids = workflow['creators'].map do |c|
+        if c.key?('identifier') && !c['identifier'].empty?
+          if c['identifier'].start_with?('http')
+            c['identifier']
+          else
+            "https://orcid.org/#{c['identifier']}"
+          end
+        else
+          "##{SecureRandom.uuid}"
+        end
+      end
+      author_uuids = uuids.map { |u| { '@id' => u.to_s } }
+      author_linked = workflow['creators'].map.with_index do |c, i|
+        {
+          '@id' => (uuids[i]).to_s,
+          '@type' => c['class'],
+          'name' => c['name'],
+        }
+      end
+      wf_ga = JSON.parse(File.read(workflow['path']))
+
+      license = workflow['license'] ? "https://spdx.org/licenses/#{workflow['license']}" : 'https://spdx.org/licenses/CC-BY-4.0'
+
+      version = time_based_version ? Time.now.to_i.to_s : Gtn::ModificationTimes.obtain_modification_count(workflow['path']).to_s + ".#{GLOBAL_WORKFLOW_OFFSET}"
+
+      features = {
+        'Includes [Galaxy Workflow Tests](https://training.galaxyproject.org/training-material/faqs/gtn/workflow_run_test.html)' => workflow['tests'],
+        'Includes a [Galaxy Workflow Report](https://training.galaxyproject.org/training-material/faqs/galaxy/workflows_report_view.html)' => workflow['features']['report'],
+        'Uses [Galaxy Workflow Comments](https://training.galaxyproject.org/training-material/faqs/galaxy/workflows_comments.html)' => workflow['features']['comments'],
+        'Uses [subworkflows](https://training.galaxyproject.org/training-material/faqs/galaxy/workflows_subworkflows.html)' => workflow['features']['subworkflows'],
+      }
+
+      mat_contribs = [
+        ['Tutorial Author(s)', Gtn::Contributors.get_authors(associated_material).map { |n| name2md(site, n) }],
+        ['Tutorial Contributor(s)', Gtn::Contributors.get_non_authors(associated_material).map { |n| name2md(site, n) }],
+        ['Workflow Author(s)', workflow['creators'].map { |c| c['name'] }],
+        ['Funder(s)', Gtn::Contributors.get_funders(associated_material).map { |n| name2md(site, n) }],
+      ].reject { |_, v| v.empty? }
+
+      description = %Q(
+#{wf_ga['annotation']}
+
+## Associated Tutorial
+
+This workflows is part of the tutorial [#{workflow['name']}](#{url}#{baseurl}/topics/#{workflow['topic_id']}/tutorials/#{workflow['tutorial_id']}/tutorial.html), available in the [GTN](https://training.galaxyproject.org)
+
+#{"## Features" if features.values.any?}
+
+#{features.select { |_, v| v }.keys.map { |f| "* #{f}" }.join("\n")}
+
+## Thanks to...
+
+#{mat_contribs.map { |k, v| "**#{k}**: #{v.join(', ')}" }.join("\n\n")}
+
+[![gtn star logo followed by the word workflows](http://galaxy-training.s3-website.us-east-1.amazonaws.com/misc/gtn-workflows.png)](https://training.galaxyproject.org/training-material/)
+      ).strip
+      # ![gtn star logo followed by the word workflows](https://training.galaxyproject.org/training-material/assets/branding/gtn-workflows.png)
+
+      crate = {
+        '@context' => ['https://w3id.org/ro/crate/1.1/context'],
+        '@graph' => [
+          {
+            '@id': 'ro-crate-metadata.json',
+            '@type': 'CreativeWork',
+            about: {
+              '@id': wfurlid,
+            },
+            conformsTo: {
+              '@id': 'https://w3id.org/ro/crate/1.1'
+            },
+          },
+          {
+            '@id': wfurlid,
+            '@type': 'Dataset',
+            name: workflow['name'],
+            description: description,
+            version: version,
+            license: license,
+            datePublished: workflow['modified'].strftime('%Y-%m-%dT%H:%M:%S.%L%:z'),
+            # hasPart: [
+            #   {
+            #     '@id': '#assembly-assembly-quality-control'
+            #   }
+            # ],
+            mainEntity: {
+              '@id': "#{wfname}.ga"
+            },
+            hasPart: [
+              {
+              '@id': "#{wfname}.ga"
+              },
+              {
+              '@id': "graph.png"
+              },
+            ]
+          },
+          {
+            '@id': "#{wfname}.ga",
+            '@type': %w[
+              File
+              SoftwareSourceCode
+              ComputationalWorkflow
+            ],
+            author: author_uuids,
+            name: workflow['name'],
+            programmingLanguage: {
+              '@id': 'https://w3id.org/workflowhub/workflow-ro-crate#galaxy'
+            },
+            image: {
+              '@id': 'graph.png'
+            }
+          },
+          {
+            '@id': 'graph.png',
+            '@type': [
+              'File',
+              'ImageObject',
+              'WorkflowSketch'
+            ],
+            contentSize: File.size(File.join(wfdir, 'graph.png')),
+          },
+          {
+            '@id': 'https://w3id.org/workflowhub/workflow-ro-crate#galaxy',
+            '@type': 'ComputerLanguage',
+            identifier: {
+              '@id': 'https://galaxyproject.org/'
+            },
+            name: 'Galaxy',
+            url: {
+              '@id': 'https://galaxyproject.org/'
+            },
+            version: '23.1'
+          }
+        ]
+      }
+      crate['@graph'] += author_linked
+      File.write(path, JSON.pretty_generate(crate))
+
+      wf_ga['tags'].map! { |t| t.gsub('^name:', '').capitalize }
+      wf_ga['tags'].push('GTN')
+      wf_ga['tags'].push('Galaxy')
+      # TODO: Remove this after https://github.com/seek4science/seek/issues/1927
+      wf_ga.delete('creator')
+
+      File.write(File.join(wfdir, 'mod.ga'), JSON.pretty_generate(wf_ga))
+      # p "Writing #{File.join(wfdir, 'mod.ga')}"
+
+      zip_path = File.join(wfdir, 'rocrate.zip')
+      Jekyll.logger.debug "[GTN/API/WFRun] Zipping #{zip_path}"
+      if File.exist?(zip_path)
+        File.delete(zip_path)
+      end
+      Zip::File.open(zip_path, create: true) do |zipfile|
+        # - The name of the file as it will appear in the archive
+        # - The original file, including the path to find it
+        zipfile.add('ro-crate-metadata.json', path)
+        zipfile.add('graph.png', File.join(wfdir, 'graph.png'))
+        zipfile.add("#{wfname}.ga", File.join(wfdir, 'mod.ga'))
+      end
+    end
+  end
+end
diff --git a/_plugins/gtn/shortlinks.rb b/_plugins/gtn/shortlinks.rb
index 5ece6afdc63d59..9e9460279e4205 100644
--- a/_plugins/gtn/shortlinks.rb
+++ b/_plugins/gtn/shortlinks.rb
@@ -9,6 +9,7 @@ module Shortlinks
     CATEGORY_NEWS = 'N'
     CATEGORY_PATHWAYS = 'P'
     CATEGORY_EVENTS = 'E'
+    CATEGORY_WORKFLOW = 'W'
 
     def self.mapped?(tutorial, current_mapping)
       current_mapping['id'].values.include? tutorial
@@ -130,6 +131,22 @@ def self.update(current_mapping)
         end
       end
 
+      # Discover workflows
+      workflows = Dir.glob('topics/**/workflows/*.ga')
+
+      workflows.each do |workflow|
+        html_path = "/#{workflow.gsub(/ga$/, 'html')}"
+        # If it's not already mapped by a key, add it.
+        if !mapped?(html_path, current_mapping)
+          # Generate a short code
+          short_code_number = current_mapping['id'].select { |x| x[0] == CATEGORY_WORKFLOW }.length.to_s.rjust(5, '0')
+          short_code = CATEGORY_WORKFLOW + short_code_number
+          puts "Discovered workflow #{short_code}"
+          # If the target of this flavour of short code isn't already in here, then add it
+          current_mapping['id'][short_code] = html_path
+        end
+      end
+
       current_mapping
     end
   end
diff --git a/_plugins/jekyll-topic-filter.rb b/_plugins/jekyll-topic-filter.rb
index 27e16b1f0bc708..d5ae4029e309b3 100644
--- a/_plugins/jekyll-topic-filter.rb
+++ b/_plugins/jekyll-topic-filter.rb
@@ -31,6 +31,10 @@ def self.enumerate_topics(site)
     list_topics_h(site).values
   end
 
+  def self.cache
+    @@cache ||= Jekyll::Cache.new('JekyllTopicFilter')
+  end
+
   ##
   # Fill the cache with all the topics
   # Params:
@@ -455,6 +459,92 @@ def self.mermaid(wf)
     "flowchart TD\n" + statements.map { |q| "  #{q}" }.join("\n")
   end
 
+  def self.graph_dot(wf)
+    # We're converting it to Mermaid
+    # flowchart TD
+    #     A[Start] --> B{Is it?}
+    #     B -- Yes --> C[OK]
+    #     C --> D[Rethink]
+    #     D --> B
+    #     B -- No ----> E[End]
+    # digraph test {
+    #
+    #   0[shape=box,style=filled,color=lightblue,label="ℹ️ Input Dataset\nBionano_dataset"]
+    #   1[shape=box,style=filled,color=lightblue,label="ℹ️ Input Dataset\nHi-C_dataset_R"]
+    #   3 -> 6 [label="output"]
+    #   7[shape=box,label="Busco"]
+    #   4 -> 7 [label="out_fa"]
+    #   8[shape=box,label="Busco"]
+    #   5 -> 8 [label="out_fa"]
+
+    statements = [
+      'node [fontname="Atkinson Hyperlegible", shape=box, color=white,style=filled,color=peachpuff,margin="0.2,0.2"];',
+      'edge [fontname="Atkinson Hyperlegible"];',
+    ]
+    wf['steps'].each_key do |id|
+      step = wf['steps'][id]
+      chosen_label = mermaid_safe_label(step['label'] || step['name'])
+
+      case step['type']
+      when 'data_collection_input'
+        statements.append "#{id}[color=lightblue,label=\"ℹ️ Input Collection\\n#{chosen_label}\"]"
+      when 'data_input'
+        statements.append "#{id}[color=lightblue,label=\"ℹ️ Input Dataset\\n#{chosen_label}\"]"
+      when 'parameter_input'
+        statements.append "#{id}[color=lightgreen,label=\"ℹ️ Input Parameter\\n#{chosen_label}\"]"
+      when 'subworkflow'
+        statements.append "#{id}[color=lightcoral,label=\"🛠️ Subworkflow\\n#{chosen_label}\"]"
+      else
+        statements.append "#{id}[label=\"#{chosen_label}\"]"
+      end
+
+      step = wf['steps'][id]
+      step['input_connections'].each do |_, v|
+        # if v is a list
+        if v.is_a?(Array)
+          v.each do |v2|
+            statements.append "#{v2['id']} -> #{id} [label=\"#{mermaid_safe_label(v2['output_name'])}\"]"
+          end
+        else
+          statements.append "#{v['id']} -> #{id} [label=\"#{mermaid_safe_label(v['output_name'])}\"]"
+        end
+      end
+
+      (step['workflow_outputs'] || [])
+        .reject { |wo| wo['label'].nil? }
+        .map do |wo|
+          wo['uuid'] = SecureRandom.uuid.to_s if wo['uuid'].nil?
+          wo
+        end
+        .each do |wo|
+          statements.append "k#{wo['uuid'].gsub('-', '')}[color=lightseagreen,label=\"Output\\n#{wo['label']}\"]"
+          statements.append "#{id} -> k#{wo['uuid'].gsub('-', '')}"
+        end
+    end
+
+    "digraph main {\n" + statements.map { |q| "  #{q}" }.join("\n") + "\n}"
+  end
+
+  def self.git_log(wf_path)
+    if Jekyll.env != 'production'
+      return []
+    end
+
+    cache.getset(wf_path) do
+      require 'shellwords'
+
+      commits = %x[git log --format="%H %at %s" #{Shellwords.escape(wf_path)}]
+        .split("\n")
+        .map { |x| x.split(' ', 3) }
+        .map { |x| { 'hash' => x[0], 'unix' => x[1], 'message' => x[2], 'short_hash' => x[0][0..8] } }
+
+      commits.map.with_index do |c, i|
+        c['num'] = commits.length - i
+        c
+      end
+    end
+  end
+
   def self.resolve_material(site, material)
     # We've already
     # looked in every /topic/*/tutorials/* folder, and turn these disparate
@@ -559,7 +649,7 @@ def self.resolve_material(site, material)
       workflow_names = workflows.map { |a| a.split('/')[-1] }
       page_obj['workflows'] = workflow_names.map do |wf|
         wfid = "#{page['topic_name']}-#{page['tutorial_name']}"
-        wfname = wf.gsub(/.ga/, '').downcase
+        wfname = wf.gsub(/.ga/, '').downcase.gsub(/[^a-z0-9]/, '-')
         trs = "api/ga4gh/trs/v2/tools/#{wfid}/versions/#{wfname}"
         wf_path = "#{folder}/workflows/#{wf}"
         wf_json = JSON.parse(File.read(wf_path))
@@ -576,6 +666,8 @@ def self.resolve_material(site, material)
         end
         workflow_test_outputs = nil if workflow_test_outputs.empty?
 
+        wfhkey = [page['topic_name'], page['tutorial_name'], wfname].join('/')
+
         {
           'workflow' => wf,
           'tests' => Dir.glob("#{folder}/workflows/" + wf.gsub(/.ga/, '-test*')).length.positive?,
@@ -585,12 +677,27 @@ def self.resolve_material(site, material)
           'wfname' => wfname,
           'trs_endpoint' => "#{domain}/#{trs}",
           'license' => license,
+          'parent_id' => page_obj['id'],
+          'topic_id' => page['topic_name'],
+          'tutorial_id' => page['tutorial_name'],
           'creators' => creators,
           'name' => wf_json['name'],
           'title' => wftitle,
+          'version' => Gtn::ModificationTimes.obtain_modification_count(wf_path),
+          'description' => wf_json['annotation'],
+          'tags' => wf_json['tags'],
+          'features' => {
+            'report' => wf_json['report'],
+            'subworkflows' => wf_json['steps'].map{|_, x| x['type']}.any?{|x| x == "subworkflow"},
+            'comments' => (wf_json['comments'] || []).length.positive?,
+            'parameters' =>  wf_json['steps'].map{|_, x| x['type']}.any?{|x| x == "parameter_input"},
+          },
+          'workflowhub_id' => (site.data['workflowhub'] || {}).fetch(wfhkey, nil),
+          'history' => git_log(wf_path),
           'test_results' => workflow_test_outputs,
           'modified' => File.mtime(wf_path),
           'mermaid' => mermaid(wf_json),
+          'graph_dot' => graph_dot(wf_json),
           'workflow_tools' => extract_workflow_tool_list(wf_json).uniq,
         }
       end
@@ -969,6 +1076,10 @@ def fetch_tutorial_material(site, topic_name, page_name)
       TopicFilter.fetch_tutorial_material(site, topic_name, page_name)
     end
 
+    def fetch_tutorial_material_by_id(site, id)
+      TopicFilter.fetch_tutorial_material(site, id.split('/')[0], id.split('/')[1])
+    end
+
     def list_topics_ids(site)
       ['introduction'] + TopicFilter.list_topics(site).filter { |k| k != 'introduction' }
     end
diff --git a/assets/branding/gtn-heart.png b/assets/branding/gtn-heart.png
index ff8721df53f799..4ade9efec6b186 100644
Binary files a/assets/branding/gtn-heart.png and b/assets/branding/gtn-heart.png differ
diff --git a/assets/branding/gtn-logo.png b/assets/branding/gtn-logo.png
index 625eeba926e7dd..32cb1226f2542e 100644
Binary files a/assets/branding/gtn-logo.png and b/assets/branding/gtn-logo.png differ
diff --git a/assets/branding/gtn-logo@512-bot.png b/assets/branding/gtn-logo@512-bot.png
new file mode 100644
index 00000000000000..286457fe77c4e8
Binary files /dev/null and b/assets/branding/gtn-logo@512-bot.png differ
diff --git a/assets/branding/gtn-logo@512.png b/assets/branding/gtn-logo@512.png
index 1acd0b7f11b596..a80d9206c8346f 100644
Binary files a/assets/branding/gtn-logo@512.png and b/assets/branding/gtn-logo@512.png differ
diff --git a/assets/branding/gtn-workflows.png b/assets/branding/gtn-workflows.png
new file mode 100644
index 00000000000000..8207f63805bff9
Binary files /dev/null and b/assets/branding/gtn-workflows.png differ
diff --git a/bin/lint.rb b/bin/lint.rb
index 309345b1efafc1..93c88457317eaa 100755
--- a/bin/lint.rb
+++ b/bin/lint.rb
@@ -1109,11 +1109,11 @@ def self.fix_file(path)
       else
         # Load tests and run some quick checks:
         possible_tests.each do |test_file|
-          if !test_file.match(/-tests?.yml/)
+          if !test_file.match(/-tests.yml/)
             results += [
               ReviewDogEmitter.file_error(path: path,
-                                          message: 'Please use the extension -test.yml ' \
-                                                   'or -tests.yml for this test file.',
+                                          message: 'Please use the extension -tests.yml ' \
+                                                   'for this test file.',
                                           code: 'GTN:032')
             ]
           end
diff --git a/bin/schema-organisations.yaml b/bin/schema-organisations.yaml
index 1f34176aacc146..a06af6d24fd72e 100644
--- a/bin/schema-organisations.yaml
+++ b/bin/schema-organisations.yaml
@@ -79,6 +79,11 @@ mapping:
                     - 2020-01
             avatar:
                 type: str
+            ror:
+                type: str
+                description: ROR ID from https://ror.org/
+                _examples:
+                  - "019w4f821"
             url:
                 type: str
                 description: associated webpage (NOTE, funders only!)
diff --git a/bin/wfh-upload.py b/bin/wfh-upload.py
new file mode 100755
index 00000000000000..dfe08133764e67
--- /dev/null
+++ b/bin/wfh-upload.py
@@ -0,0 +1,97 @@
+#!/usr/bin/env python
+import yaml
+import json
+import os
+import sys
+import requests
+import glob
+import time
+import multiprocessing
+
+GTN_PROJECT_ID = 63
+
+if len(sys.argv) == 2:
+    crates = [sys.argv[1]]
+else:
+    crates = glob.glob(
+        "_site/training-material/api/workflows/**/rocrate.zip", recursive=True
+    )
+
+def doUpload(crate_path):
+    payload = {
+        "ro_crate": (crate_path, open(crate_path, "rb")),
+        "workflow[project_ids][]": (None, GTN_PROJECT_ID), # GTN's ID.
+    }
+    headers = {
+        "authorization": "Token " + os.environ["DEV_WFH_TOKEN"], 
+        'User-Agent': 'GTN (github.com/galaxyproject/training-material@1.0)',
+    }
+
+    response = requests.post(
+        "https://dev.workflowhub.eu/workflows/submit", files=payload, headers=headers
+    )
+    code = response.status_code
+    if code != 200:
+        print(f"Error {code} uploading {crate_path}")
+        print(response.text)
+        return None
+
+    add_discussion_channel = False
+
+    wfid = response.json()['data']['id']
+    permissions_update = {
+      "data": {
+        "id": wfid,
+        "type": "workflows",
+        "attributes": {
+          "policy": {
+            "access": "download",
+            "permissions": [
+              {
+                "resource": {
+                  "id": str(GTN_PROJECT_ID),
+                  "type": "projects"
+                },
+                "access": "manage"
+              }
+            ]
+          }
+        }
+      }
+    }
+
+    if response.json()['data']['attributes']['discussion_links'] and not any(
+        x['label'] == 'GTN Matrix' for x in response.json()['data']['attributes']['discussion_links']
+    ):
+        permissions_update['data']['attributes']['discussion_links'] = [
+            {
+                "label": "GTN Matrix",
+                "url": "https://matrix.to/#/%23galaxyproject_admin:gitter.im" # Must encode the second #
+            }
+        ]
+
+
+    headers.update({
+        'Content-type': 'application/json',
+        'Accept': 'application/json',
+    })
+    response2 = requests.put(f"https://dev.workflowhub.eu/workflows/{wfid}", headers=headers, json=permissions_update)
+    if response2.status_code != 200:
+        print(f"Error {response2.status_code} updating permissions for {wfid}: {response2.text}")
+
+    p = crate_path.split("/")
+    (topic, tutorial, workflow) = p[3:6]
+    return (topic, tutorial, workflow, wfid)
+
+
+with multiprocessing.Pool(4) as p:
+    results = p.map(doUpload, crates)
+
+results = [x for x in results if x is not None]
+
+data = {}
+for (topic, tutorial, workflow, wf_id) in results:
+    data['/'.join([topic, tutorial, workflow])] = wf_id
+
+with open('metadata/workflowhub.yml', 'w') as handle:
+    yaml.dump(data, handle)
diff --git a/faqs/galaxy/workflows_report_view.md b/faqs/galaxy/workflows_report_view.md
index e98693762d5197..500f3ea1c216be 100644
--- a/faqs/galaxy/workflows_report_view.md
+++ b/faqs/galaxy/workflows_report_view.md
@@ -1,7 +1,7 @@
 ---
 title: Viewing a workflow report
 area: workflows
-description: When creating a workflow in Galaxy, you can also define an output report page that should be created. Here you can display certain outputs of the pipeline (e.g. output files, tables, images, etc.) and other information about the run.
+description: You can find the workflow report from the workflow invocation
 box_type: tip
 layout: faq
 contributors: [hexylena,shiltemann]
diff --git a/topics/admin/tutorials/introduction/slides.html b/topics/admin/tutorials/introduction/slides.html
index 20155804546324..f3024a9bce9b42 100644
--- a/topics/admin/tutorials/introduction/slides.html
+++ b/topics/admin/tutorials/introduction/slides.html
@@ -84,7 +84,7 @@
 # Software Requirements
 
 Required:
-  - Galaxy is written in Python and depends on **Python 3.5** or newer
+  - Galaxy is written in Python and depends on **Python 3.8** or newer
 
 Minimal [production](https://docs.galaxyproject.org/en/master/admin/production.html) requirements:
   - [PostgreSQL]({% link topics/admin/tutorials/database/slides.html %})
diff --git a/topics/admin/tutorials/tool-management/slides.html b/topics/admin/tutorials/tool-management/slides.html
index 32d3a0e3c616ff..74cf8c51eea771 100644
--- a/topics/admin/tutorials/tool-management/slides.html
+++ b/topics/admin/tutorials/tool-management/slides.html
@@ -127,6 +127,7 @@
     <section id="getext" name="Get Data">
         <tool file="data_source/upload.xml"/>
         <tool file="data_source/ucsc_tablebrowser.xml"/>
+        <tool_dir dir="local-tools/" />
 ...
 ```
 
diff --git a/topics/admin/tutorials/troubleshooting/slides.html b/topics/admin/tutorials/troubleshooting/slides.html
index 7f72c0a47e6882..6a2d6e0589283e 100644
--- a/topics/admin/tutorials/troubleshooting/slides.html
+++ b/topics/admin/tutorials/troubleshooting/slides.html
@@ -37,6 +37,7 @@
 # Most common problems
 
 - Startup problems
+- Disk Full, Database Disk Full
 - Web/UI problems
 - Tool failures
 - Job execution problems