diff --git a/tools/docker/images/nginx/root/etc/nginx/conf.d/default.conf b/tools/docker/images/nginx/root/etc/nginx/conf.d/default.conf
index d152d411..eaf7714d 100644
--- a/tools/docker/images/nginx/root/etc/nginx/conf.d/default.conf
+++ b/tools/docker/images/nginx/root/etc/nginx/conf.d/default.conf
@@ -13,10 +13,17 @@ server {
 
   location / {
     root /app;
+
     index index.html index.htm;
+
+    try_files $uri/index.html $uri.html $uri/ $uri =404;
+
+    error_page 404 /404.html;
   }
 
-  error_page 404 /404.html;
+  location ~ ^(.+)/$ {
+    return 301 $1$is_args$args;
+  }
 
   rewrite ^/10-useful-drupal-6-modules-i-use-every-project$ /blog/10-useful-drupal-6-modules;
   rewrite ^/2010/04/05/styling-drupal-6s-taxonomy-lists-with-php-css-and-jquery$ /blog/style-drupal-6s-taxonomy-lists-php-css-jquery;