diff --git a/doc/source/horizon/dev.environment.guide.rst b/doc/source/horizon/dev.environment.guide.rst
index 1c42e763..674f51ed 100644
--- a/doc/source/horizon/dev.environment.guide.rst
+++ b/doc/source/horizon/dev.environment.guide.rst
@@ -33,13 +33,13 @@ using the following command:
 
 .. sourcecode:: console
 
-    $ keystone endpoint-list
+    $ openstack endpoint list
 
 You can list the registered services with this command:
 
 .. sourcecode:: console
 
-    $ keystone service-list
+    $ openstack service list
 
 Sahara service should be present in keystone service list with service type
 *data-processing*
diff --git a/doc/source/userdoc/dashboard.guide.rst b/doc/source/userdoc/dashboard.guide.rst
index 249f6dfd..25391f13 100644
--- a/doc/source/userdoc/dashboard.guide.rst
+++ b/doc/source/userdoc/dashboard.guide.rst
@@ -44,14 +44,18 @@ Local endpoint example:
 
 .. sourcecode:: console
 
-    keystone service-create --name sahara_local --type data_processing_local \
-        --description "Sahara Data Processing (local installation)"
+    openstack service create --name sahara_local --description \
+        "Sahara Data Processing (local installation)" \
+        data_processing_local
 
-    keystone endpoint-create --service sahara_local --region RegionOne \
-        --publicurl "http://127.0.0.1:8386/v1.1/%(tenant_id)s" \
-        --adminurl "http://127.0.0.1:8386/v1.1/%(tenant_id)s" \
-        --internalurl "http://127.0.0.1:8386/v1.1/%(tenant_id)s"
+    openstack endpoint create --region RegionOne \
+        sahara_local public "http://127.0.0.1:8386/v1.1/%(tenant_id)s"
 
+    openstack endpoint create --region RegionOne \
+        sahara_local admin "http://127.0.0.1:8386/v1.1/%(tenant_id)s"
+
+    openstack endpoint create --region RegionOne \
+        sahara_local internal "http://127.0.0.1:8386/v1.1/%(tenant_id)s"
 ..
 
 Then the endpoint name should be changed in ``sahara.py`` under the module of