diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
index 2f35f4a07..112e34423 100644
--- a/app/config/sculpin_site.yml
+++ b/app/config/sculpin_site.yml
@@ -63,6 +63,9 @@ twitter:
     url: 'https://twitter.com/%twitter.name%'
 
 work:
+    company:
+        name: Transport for Wales
+        url: https://trc.cymru
     role: Lead Software Developer
 
 youtube:
diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index 44ab386b0..62d7651c6 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -14,6 +14,9 @@
             </div>
         </div>
 
-        {% include 'about-author' %}
+        {% include 'about-author' with {
+            avatar: site.avatar,
+            work: site.work,
+        } only %}
     </div>
 {% endblock %}
diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig
index 92239fa68..fa9d2d34c 100644
--- a/source/_layouts/talk.html.twig
+++ b/source/_layouts/talk.html.twig
@@ -20,6 +20,9 @@
             } only %}
         </div>
 
-        {% include 'about-author' %}
+        {% include 'about-author' with {
+            avatar: site.avatar,
+            work: site.work,
+        } only %}
     </div>
 {% endblock %}
diff --git a/source/_pages/index.md b/source/_pages/index.md
index 1db4a3017..7c2111d1c 100644
--- a/source/_pages/index.md
+++ b/source/_pages/index.md
@@ -7,7 +7,7 @@ is_front: true
 <div class="markdown" markdown="1">
 <div class="w-32 mb-4"><img src="/sites/default/files/images/social-avatar.jpg" alt="Picture of Oliver" class="border rounded-full border-gray"></div>
 
-Hi, I'm Oliver Davies (aka <a href="https://www.google.com/#q=opdavies">opdavies</a>). I’m a Lead Software Developer at <a href="https://trc.cymru?utm_source=oliverdavies.uk&amp;utm_medium=about">Transport for Wales</a> and a part-time freelance Web Developer and System Administrator, based in Wales, UK.
+Hi, I'm Oliver Davies (aka <a href="https://www.google.com/#q=opdavies">opdavies</a>). I’m a {{ site.work.role }} at <a href="{{ site.work.company.url }}?utm_source=oliverdavies.uk&amp;utm_medium=about">{{ site.work.company.name }}</a> and a part-time freelance Web Developer and System Administrator, based in Wales, UK.
 
 I’ve been a Developer since 2007 and specialise in using Drupal, Symfony and Vue.js. I use Ansible for server provisioning and application deployments.
 
diff --git a/source/_partials/about-author.html.twig b/source/_partials/about-author.html.twig
index 29728108f..2d2a96e5f 100644
--- a/source/_partials/about-author.html.twig
+++ b/source/_partials/about-author.html.twig
@@ -3,13 +3,13 @@
 
   <div class="flex mt-4 space-x-4">
     <div class="flex-shrink-0">
-      <img src="/sites/default/files/images/social-avatar.jpg" alt="Picture of Oliver" class="w-16 h-16 border rounded-full border-gray">
+        <img src="{{ avatar.url }}" alt="Picture of Oliver" class="w-16 h-16 border rounded-full border-gray">
     </div>
 
     <div>
       <p>
         Oliver Davies is a PHP Developer and Linux Systems Administrator based in the UK.
-        He is a Lead Software Developer at <a href="https://trc.cymru?utm_source=oliverdavies.uk&amp;utm_medium=about-author" class="link">Transport for Wales</a> and a part-time freelancer specialising in Drupal and Symfony application development.
+        He is a {{ work.role }} at <a href="{{ work.company.url }}?utm_source=oliverdavies.uk&amp;utm_medium=about-author" class="link">{{ work.company.name }}</a> and a part-time freelancer specialising in Drupal and Symfony application development.
       </p>
     </div>
   </div>