diff --git a/website/redirects.txt b/website/redirects.txt
index 635aab549..e8c9f18ff 100644
--- a/website/redirects.txt
+++ b/website/redirects.txt
@@ -180,7 +180,7 @@
 /guides/cluster/bootstrapping.html /guides/operations/cluster/bootstrapping.html
 /guides/cluster/manual.html        /guides/operations/cluster/manual.html
 /guides/cluster/federation         /guides/operations/federation
-/guides/cluster/requirements.html  /guides/operations/requirements.html  
+/guides/cluster/requirements.html  /guides/operations/requirements.html
 /guides/nomad-metrics.html         /guides/operations/monitoring/nomad-metrics.html
 /guides/node-draining.html         /guides/operations/node-draining.html
 /guides/outage.html                /guides/operations/outage.html
@@ -191,7 +191,11 @@
 /guides/sentinel-policy.html       /guides/security/sentinel-policy.html
 /guides/sentinel/job.html          /guides/governance-and-policy/sentinel/job.html
 
-/guides/spark/                                    /guides/analytical-workloads/spark/spark.html
+/guides/analytical-workloads/spark/spark.html     /guides/analytical-workloads/spark/index.html
+/guides/spark                                     /guides/analytical-workloads/spark/index.html
+/guides/spark/                                    /guides/analytical-workloads/spark/index.html
+/guides/spark/index.html                          /guides/analytical-workloads/spark/index.html
+/guides/spark/spark.html                          /guides/analytical-workloads/spark/index.html
 /guides/spark/pre.html                            /guides/analytical-workloads/spark/pre.html
 /guides/security/namespaces.html                  /guides/governance-and-policy/namespaces.html
 /guides/security/quotas.html                      /guides/governance-and-policy/quotas.html
@@ -205,5 +209,11 @@
 /guides/operations/consul-integration/index.html  /guides/integrations/consul-integration/index.html
 /guides/operations/vault-integration/index.html   /guides/integrations/vault-integration/index.html
 /guides/advanced-scheduling/                      /guides/operating-a-job/advanced-scheduling/
-/guides/external/                                 /guides/operating-a-job/external/
-/guides/operations/upgrade/                       /guides/upgrade/
+/guides/external                                  /guides/operating-a-job/external/index.html
+/guides/external/                                 /guides/operating-a-job/external/index.html
+/guides/external/index.html                       /guides/operating-a-job/external/index.html
+/guides/external/lxc.html                         /guides/operating-a-job/external/lxc.html
+/guides/operations/upgrade                        /guides/upgrade/index.html
+/guides/operations/upgrade/                       /guides/upgrade/index.html
+/guides/operations/upgrade/index.html             /guides/upgrade/index.html
+/guides/operations/upgrade/upgrade-specific.html  /guides/upgrade/upgrade-specific.html
diff --git a/website/source/guides/analytical-workloads/spark/spark.html.md b/website/source/guides/analytical-workloads/spark/index.html.md
similarity index 100%
rename from website/source/guides/analytical-workloads/spark/spark.html.md
rename to website/source/guides/analytical-workloads/spark/index.html.md
diff --git a/website/source/layouts/guides.erb b/website/source/layouts/guides.erb
index 2cde69e02..1193d715a 100644
--- a/website/source/layouts/guides.erb
+++ b/website/source/layouts/guides.erb
@@ -211,7 +211,7 @@
 
         <ul class="nav">
           <li<%= sidebar_current("guides-analytical-workloads") %>>
-            <a href="/guides/analytical-workloads/spark/spark.html">Apache Spark</a>
+            <a href="/guides/analytical-workloads/spark/index.html">Apache Spark</a>
               <ul class="nav">
                 <li<%= sidebar_current("guides-analytical-workloads-spark-pre") %>>
                   <a href="/guides/analytical-workloads/spark/pre.html">Getting Started</a>