diff --git a/_data/setup.yml b/_data/setup.yml
index 80f87c19fb..3e1fb0e4c1 100644
--- a/_data/setup.yml
+++ b/_data/setup.yml
@@ -26,8 +26,7 @@ toc:
   - docs/getting-started-guides/clc.md
   - title: Running Kubernetes on IBM SoftLayer
     path: https://github.com/patrocinio/kubernetes-softlayer
-  - title: Running Kubernetes on Multiple Clouds with Stackpoint.io
-    path: /docs/getting-started-guides/stackpoint/
+  - docs/getting-started-guides/stackpoint.md
 
 - title: Custom Solutions
 
@@ -76,7 +75,7 @@ toc:
         - docs/getting-started-guides/ubuntu/validation.md
         - docs/getting-started-guides/ubuntu/backups.md
         - docs/getting-started-guides/ubuntu/upgrades.md
-        - docs/getting-started-guides/ubuntu/scaling.mdfnet
+        - docs/getting-started-guides/ubuntu/scaling.md
         - docs/getting-started-guides/ubuntu/installation.md
         - docs/getting-started-guides/ubuntu/monitoring.md
         - docs/getting-started-guides/ubuntu/networking.md
diff --git a/docs/getting-started-guides/ubuntu/index.md b/docs/getting-started-guides/ubuntu/index.md
index ff6f7990e6..2d697bfeda 100644
--- a/docs/getting-started-guides/ubuntu/index.md
+++ b/docs/getting-started-guides/ubuntu/index.md
@@ -1,5 +1,8 @@
 ---
 title: Kubernetes on Ubuntu
+redirect_from:
+- "/docs/getting-started-guides/ubuntu/calico/"
+- "/docs/getting-started-guides/ubuntu/calico.html"
 ---
 
 {% capture overview %}