diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
index afa2d261..17da3bba 100644
--- a/app/config/sculpin_site.yml
+++ b/app/config/sculpin_site.yml
@@ -9,16 +9,6 @@ favicon_sizes: [ 160, 96, 32, 16 ]
 ansible_galaxy:
     url: https://galaxy.ansible.com/opdavies
 
-author:
-    name: Oliver Davies
-    bio: 'Oliver Davies is a Web Developer, System Administrator and Drupal specialist based in the UK. He is a Senior Developer at <a href="https://www.microserve.io">Microserve</a> and also provides freelance consultancy services for Drupal websites, PHP applications and Linux servers.'
-    company:
-        logo: microserve.png
-        name: Microserve
-        name_short: Microserve
-        role: Senior Drupal Developer
-        website: https://www.microserve.io
-
 availability:
     part: limited
     full: no
@@ -48,6 +38,7 @@ companies:
         logo: lab-class.png
     microserve:
         name: Microserve
+        name_short: Microserve
         website: https://microserve.io
         logo: microserve.png
     nomensa:
@@ -209,3 +200,7 @@ talks_events:
         title: Unified Diff
         website: http://unifieddiff.co.uk
         location: 'Cardiff, UK'
+
+work:
+    role: Senior Drupal Developer
+    company: microserve
diff --git a/source/_partials/post/about-author.twig b/source/_partials/post/about-author.twig
index 3f9d0f3e..0103da2b 100644
--- a/source/_partials/post/about-author.twig
+++ b/source/_partials/post/about-author.twig
@@ -3,5 +3,5 @@
 
     <img src="{{ site.gravatar.url }}?s=100" alt="Picture of Oliver" class="img-circle">
 
-    <p>{{ site.author.bio|raw }}</p>
+    <p>Oliver Davies is a Web Developer, System Administrator and Drupal specialist based in the UK. He is a {{ site.work.role }} at <a href="{{ site.companies[site.work.company].website }}">{{ site.companies[site.work.company].name }}</a> and also provides freelance consultancy services for Drupal websites, PHP applications and Linux servers.</p>
 </div>
diff --git a/source/index.md b/source/index.md
index 0e4e7a4f..5a3ce113 100644
--- a/source/index.md
+++ b/source/index.md
@@ -27,7 +27,7 @@ use: [posts]
 
 <img src="{{ site.gravatar.url }}?s=200" alt="Picture of Oliver" class="me img-circle">
 
-My name is Oliver Davies (aka [opdavies][1]), I’m a Web Developer and System Administrator based in Wales, UK. I’m a {{ site.author.company.role }} at [{{ site.author.company.name }}][20], part-time freelancer, open source contributor, mentor and conference speaker.
+My name is Oliver Davies (aka [opdavies][1]), I’m a Web Developer and System Administrator based in Wales, UK. I’m a {{ site.work.role }} at [{{ site.companies[site.work.company].name }}][20], part-time freelancer, open source contributor, mentor and conference speaker.
 
 I’m a provisional member of the [Drupal Security team][14] and a documentation maintainer for Drupal.org. I speak at various conferences and user groups, co-organise [Drupal Bristol][15] and [PHPSW][17], and am a co-founder and co-organiser of [DrupalCamp Bristol][18].
 
@@ -69,7 +69,7 @@ I’m a provisional member of the [Drupal Security team][14] and a documentation
 [17]: https://phpsw.uk
 [18]: http://www.drupalcampbristol.co.uk
 [19]: {{site.url}}/talks/
-[20]: {{site.author.company.website}}
+[20]: {{site.companies[site.work.company].website}}
 [21]: {{site.twitter.url}}
 [22]: {{site.drupalorg.url_nice}}
 [23]: {{site.github.url}}
diff --git a/source/speaker-info.md b/source/speaker-info.md
index 38e1cf75..519079d6 100644
--- a/source/speaker-info.md
+++ b/source/speaker-info.md
@@ -6,11 +6,11 @@ use: [posts]
 ---
 ## Job title
 
-{{ site.author.company.role }} at [{{ site.author.company.name }}][0].
+{{ site.work.role }} at [{{ site.companies[site.work.company].name }}][0].
 
 ## Bio
 
-Oliver has been building websites since 2007, specialising in PHP and Drupal since 2008, and more recently also working with Symfony, Silex, Laravel and Sculpin. He is a {{ site.author.company.role }} at [{{ site.author.company.name_short }}][0], a Drupal core contributor and module maintainer, and a provisional member of the Drupal Security team.
+Oliver has been building websites since 2007, specialising in PHP and Drupal since 2008, and more recently also working with Symfony, Silex, Laravel and Sculpin. He is a {{ site.work.role }} at [{{ site.companies[site.work.company].name_short }}][0], a Drupal core contributor and module maintainer, and a provisional member of the Drupal Security team.
 
 In his spare time, Oliver can usually be found attending or organising a user group or conference, or working on freelance or open source projects.
 
@@ -37,4 +37,4 @@ Here are some videos of my previous talks:
 - <https://www.youtube.com/watch?v=qO_Wh5WE3VA>
 - <https://www.youtube.com/watch?v=Yi_FPI3xHwc>
 
-[0]: {{site.author.company.website}}
+[0]: {{site.companies[site.work.company].website}}