diff --git a/README.rst b/README.rst
index 4adb3974a1..2bb405c9a2 100644
--- a/README.rst
+++ b/README.rst
@@ -28,6 +28,7 @@ If you'd like to run from the master branch, you can clone the git repo:
 * Wiki: http://wiki.openstack.org/Heat
 * Developer docs: http://docs.openstack.org/developer/heat
 * Template samples: https://git.openstack.org/cgit/openstack/heat-templates
+* Agents: https://git.openstack.org/cgit/openstack/heat-agents
 
 Python client
 -------------
diff --git a/doc/source/getting_started/jeos_building.rst b/doc/source/getting_started/jeos_building.rst
index fb537140c3..0c32461fc9 100644
--- a/doc/source/getting_started/jeos_building.rst
+++ b/doc/source/getting_started/jeos_building.rst
@@ -44,7 +44,7 @@ To create a heat-cfntools enabled image with the current release of Fedora x86_6
 The image may then be pushed to glance, e.g::
 
     source ~/.openstack/keystonerc
-    glance image-create --name fedora-heat-cfntools --visibility public --disk-format qcow2 --container-format bare < fedora-heat-cfntools.qcow2
+    openstack image create fedora-heat-cfntools --public --disk-format qcow2 --container-format bare < fedora-heat-cfntools.qcow2
 
 To create a heat-cfntools enabled image with the current release of Ubuntu i386::
 
@@ -65,8 +65,8 @@ you can follow the steps below to build a fedora based image::
 
     pip install git+https://git.openstack.org/openstack/diskimage-builder
     git clone https://git.openstack.org/openstack/tripleo-image-elements
-    git clone https://git.openstack.org/openstack/heat-templates
-    export ELEMENTS_PATH=tripleo-image-elements/elements:heat-templates/hot/software-config/elements
+    git clone https://git.openstack.org/openstack/heat-agents
+    export ELEMENTS_PATH=tripleo-image-elements/elements:heat-agents
     disk-image-create vm \
         fedora selinux-permissive \
         heat-config \
@@ -81,4 +81,4 @@ you can follow the steps below to build a fedora based image::
 The image may then be pushed to glance, e.g::
 
     source ~/.openstack/keystonerc
-    glance image-create --name=fedora-software-config --visibility public --disk-format=qcow2 --container-format=bare < fedora-software-config.qcow2
+    openstack image create fedora-software-config --public --disk-format=qcow2 --container-format=bare < fedora-software-config.qcow2
diff --git a/doc/source/template_guide/software_deployment.rst b/doc/source/template_guide/software_deployment.rst
index 42892d5c4a..e0264a317c 100644
--- a/doc/source/template_guide/software_deployment.rst
+++ b/doc/source/template_guide/software_deployment.rst
@@ -476,10 +476,10 @@ required in later examples:
     # via pypi or as distro packages.
     git clone https://git.openstack.org/openstack/diskimage-builder.git
     git clone https://git.openstack.org/openstack/tripleo-image-elements.git
-    git clone https://git.openstack.org/openstack/heat-templates.git
+    git clone https://git.openstack.org/openstack/heat-agents.git
 
     # Required by diskimage-builder to discover element collections
-    export ELEMENTS_PATH=tripleo-image-elements/elements:heat-templates/hot/software-config/elements
+    export ELEMENTS_PATH=tripleo-image-elements/elements:heat-agents/
 
     # The base operating system element(s) provided by the diskimage-builder
     # elements collection. Other values which may work include:
@@ -510,8 +510,8 @@ required in later examples:
          $DEPLOYMENT_BASE_ELEMENTS $DEPLOYMENT_TOOL -o $IMAGE_NAME.qcow2
 
     # Upload the image, assuming valid credentials are already sourced
-    glance image-create --disk-format qcow2 --container-format bare \
-        --name $IMAGE_NAME < $IMAGE_NAME.qcow2
+    openstack image create --disk-format qcow2 --container-format bare \
+        $IMAGE_NAME < $IMAGE_NAME.qcow2
 
 .. note:: Above script uses diskimage-builder, make sure the environment
           already fulfill all requirements in requirements.txt of