diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index e27dc6b..d3245c8 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -3,16 +3,34 @@ name: Build and Deploy GitHub Pages
 on:
   push:
     branches:
-      - main
+      - master
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
 
 jobs:
-  build:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
-
     steps:
       # Step 1: Check out the repository
       - name: Check out the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
 
       # Step 2: Set up Pandoc
       - name: Install Pandoc
@@ -24,7 +42,12 @@ jobs:
       - name: Convert Markdown to HTML with Pandoc
         run: pandoc --template respec.template -f markdown-auto_identifiers --wrap=none index.md -o index.html
 
-      # Step 4: Deploy to GitHub Pages
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload entire repository
+          path: 'index.html'
       - name: Deploy to GitHub Pages
+        id: deployment
         uses: actions/deploy-pages@v4
 
diff --git a/index.md b/index.md
index adf68fc..b01d724 100644
--- a/index.md
+++ b/index.md
@@ -122,8 +122,10 @@ Other models [TO REVIEW]:
 The following diagram depicts the OntoLex module for frequency, attestation and corpus information (_OntoLex-FrAC_). Boxes represent classes of the model. Arrows with filled heads represent object properties. Arrows with empty heads represent `rdfs:subClassOf`. Vocabulary elements introduced by this module are shaded grey (classes) or set in _italics_.
 
 
+<figure id="overview-figure">
 ![](https://raw.githubusercontent.com/acoli-repo/frac-addenda/master/img/diagram-2023.png)
-Fig. 2 OntoLex Module for Frequency, Attestation and Corpus Information (_FrAC_), overview 
+<figcaption>OntoLex Module for Frequency, Attestation and Corpus Information (_FrAC_), overview</figcaption>
+</figure>
 
 </section>
 </section>
@@ -152,7 +154,7 @@ The top-level concepts of OntoLex-FrAC are thus `frac:Observable` and `frac:Obse
 
 <figure>
 ![](img/ontolex-element.png "frac:Observable")
-Fig. 1. `frac:Observable` as a superclass of ontolex:LexicalEntry, ontolex:Form, ontolex:LexicalSense and ontolex:LexicalConcept
+<figcaption>`frac:Observable` as a superclass of ontolex:LexicalEntry, ontolex:Form, ontolex:LexicalSense and ontolex:LexicalConcept</figcaption>
 </figure>
 
 </section>