diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf
index 90f3d371..39a5a62d 100644
--- a/docker/nginx/conf.d/default.conf
+++ b/docker/nginx/conf.d/default.conf
@@ -9,7 +9,6 @@ server {
 
     error_page 404 /404.html;
     
-    rewrite ^/(services|work)/?$ /experience permanent;
     rewrite "^/about/?$" / permanent;
     rewrite "^/blog/10-useful-drupal-6-modules/?$" /blog/2010/06/25/10-useful-drupal-6-modules permanent;
     rewrite "^/blog/2012/07/nomensa-accessible-media-player-drupal/?$" /blog/install-nomensa-media-player-drupal/ permanent;
@@ -90,13 +89,13 @@ server {
     rewrite "^/blog/some-useful-links-using-simpletest-drupal/?$" /blog/2013/06/13/some-useful-links-using-simpletest-drupal permanent;
     rewrite "^/blog/south-wales-drupal-user-group/?$" /blog/2010/09/26/south-wales-drupal-user-group permanent;
     rewrite "^/blog/style-drupal-6s-taxonomy-lists-php-css-and-jquery/?$" /blog/2010/04/05/style-drupal-6s-taxonomy-lists-php-css-and-jquery permanent;
+    rewrite "^/blog/tdd-test-driven-drupal/?$" /blog/2017/11/07/tdd-test-driven-drupal permanent;
     rewrite "^/blog/thanks/?$" /blog/2014/05/06/thanks permanent;
     rewrite "^/blog/updating-features-and-adding-components-using-drush/?$" /blog/2014/10/21/updating-features-and-adding-components-using-drush permanent;
     rewrite "^/blog/updating-forked-repositories-on-github/?$" /blog/2015/06/18/updating-forked-repositories-on-github permanent;
     rewrite "^/blog/use-authorized-keys-create-passwordless-ssh-connection/?$" /blog/2012/02/01/use-authorized-keys-create-passwordless-ssh-connection permanent;
     rewrite "^/blog/use-regular-expressions-search-and-replace-coda-or-textmate/?$" /blog/2010/11/04/use-regular-expressions-search-and-replace-coda-or-textmate permanent;
     rewrite "^/blog/use-sass-and-compass-drupal-7-using-sassy/?$" /blog/2012/12/06/use-sass-and-compass-drupal-7-using-sassy permanent;
-    rewrite "^/blog/tdd-test-driven-drupal/?$" /blog/2017/11/07/tdd-test-driven-drupal permanent;
     rewrite "^/blog/useful-vagrant-commands/?$" /blog/2013/11/27/useful-vagrant-commands permanent;
     rewrite "^/blog/using-imagecache-and-imagecrop-my-portfolio/?$" /blog/2010/04/28/using-imagecache-and-imagecrop-my-portfolio permanent;
     rewrite "^/blog/using-remote-files-when-developing-locally-with-stage-file-proxy-module/?$" /blog/2014/11/20/using-remote-files-when-developing-locally-with-stage-file-proxy-module permanent;
@@ -131,11 +130,12 @@ server {
     rewrite "^/talks/2016/11/17/goodbye-drush-make-hello-composer-drupal-bristol/?$" /talks/goodbye-drush-make-hello-composer permanent;
     rewrite "^/talks/2017/01/18/getting-your-data-into-drupal-8-drupal-bristol/?$" /talks/getting-your-data-into-drupal-8 permanent;
     rewrite "^/talks/2017/03/04/getting-your-data-into-drupal-8-drupalcamp-london-2017/?$" /talks/getting-your-data-into-drupal-8 permanent;
-    rewrite '^/talks/deploying-php-applications-with-fabric/?$' /talks/deploying-php-fabric permanent;
     rewrite "^/talks/drupal-vm-generator-2/?$" /talks/drupal-vm-generator permanent;
     rewrite "^/talks/drupalorg-2015-2/?$" /talks/drupalorg-2015 permanent;
     rewrite "^/talks/drupalorg-in-2015-whats-coming-next/?$" /talks/drupalorg-2015 permanent;
+    rewrite "^/terms-and-conditions/?$" /terms permanent;
+    rewrite '^/talks/deploying-php-applications-with-fabric/?$' /talks/deploying-php-fabric permanent;
     rewrite '^/talks/getting-started-with-drupal-8-module-development/?$' /drupal-8-module-development permanent;
     rewrite '^/talks/sculpin/?$' /talks/building-static-websites-sculpin permanent;
-    rewrite "^/terms-and-conditions/?$" /terms permanent;
+    rewrite ^/(services|work)/?$ /experience permanent;
 }