diff --git a/doc/source/_templates/layout.html b/doc/source/_templates/layout.html
index 31d3ce52..e6b6ae92 100644
--- a/doc/source/_templates/layout.html
+++ b/doc/source/_templates/layout.html
@@ -54,6 +54,7 @@
 
       <span class="title">Upgrade Version</span>
       <ul>
+        <li><input type="checkbox" id="ktol" checked="checked"><label for="ktol" title="Upgrading Kilo to Liberty is not supported">Upgrading Kilo to Liberty (unsupported)</label></li>
         <li><input type="checkbox" id="ltom" checked="checked"><label for="ltom" title="Step that should only be run for upgrading from Liberty to Mitaka">Upgrading Liberty to Mitaka</label></li>
         <li><input type="checkbox" id="mton" checked="checked"><label for="mton" title="Step that should only be run for upgrading from Mitaka to Newton">Upgrading Mitaka to Newton</label></li>
       </ul>
diff --git a/doc/source/post_deployment/upgrade.rst b/doc/source/post_deployment/upgrade.rst
index 4379ce19..5f5eff43 100644
--- a/doc/source/post_deployment/upgrade.rst
+++ b/doc/source/post_deployment/upgrade.rst
@@ -81,7 +81,6 @@ Upgrading the Undercloud
 
    The following command will upgrade the undercloud::
 
-      # TODO: In the future this might be taken care of by tripleoclient automatically
       sudo systemctl stop openstack-*
       sudo systemctl stop neutron-*
       sudo yum -y update instack-undercloud openstack-puppet-modules openstack-tripleo-common python-tripleoclient
diff --git a/doc/source/repositories.txt b/doc/source/repositories.txt
index 3f526a10..3c76b048 100644
--- a/doc/source/repositories.txt
+++ b/doc/source/repositories.txt
@@ -5,7 +5,7 @@
       Do not enable any other repos not explicitly marked for that release.
 
       .. admonition:: Liberty
-         :class: liberty
+         :class: liberty ktol
 
          Enable latest RDO Liberty Delorean repository for all packages
 
@@ -20,7 +20,7 @@
             sudo curl -L -o /etc/yum.repos.d/delorean-deps-liberty.repo http://trunk.rdoproject.org/centos7-liberty/delorean-deps.repo
 
       .. admonition:: Mitaka
-         :class: mitaka
+         :class: mitaka ltom
 
          Enable latest RDO Mitaka Delorean repository for all packages