diff --git a/web/support/kb/openstack/gnocchi.rst b/web/support/kb/openstack/gnocchi.rst
index 0bce855eef9202f469eef3f80563e8ec0bf12742..b0bf110e8a348e9ec74802f9048a6771d708e9da 100644
--- a/web/support/kb/openstack/gnocchi.rst
+++ b/web/support/kb/openstack/gnocchi.rst
@@ -20,29 +20,6 @@ See https://docs.openstack.org/project-install-guide/telemetry/ocata/install-bas
     apt-get install ceilometer-collector \
       ceilometer-agent-central ceilometer-agent-notification \
       python-ceilometerclient python-libvirt
-
-Note that Version 6.1 has bugs, so it is better to install from sources Version 8.1
-
-From sources:
-See https://github.com/openstack/ceilometer/blob/master/doc/source/install/manual.rst
-::
-
-    cd /opt/stack
-    git clone https://git.openstack.org/openstack/ceilometer.git
-
-    cd ceilometer
-    sudo python setup.py install
-    sudo apt install tox
-    sudo apt install python3-dev libffi-dev libel-dev
-    # generates ceilometer.conf
-    tox -egenconfig
-    # optional
-    sudo apt install python-libvirt
-
-    sudo systemctl unmask ceilometer-agent-compute
-    sudo systemctl unmask ceilometer-agent-central
-    sudo systemctl unmask ceilometer-agent-notification
-    sudo systemctl unmask ceilometer-collector
     
 Configure the services
 ----------------------
@@ -64,7 +41,21 @@ to configure `Ceilometer` itself and the controller services.
 Installation
 ============
 
-Gnocchi can be installed using the charm being developed at https://github.com/openstack-charmers/charm-gnocchi.
+Manual
+......
+See these `instructions <http://gnocchi.xyz/stable_4.1/install.html>`_
+
+Once `Gnocchi` is running, connect it to `Ceilometer`.
+In the `Ceilometer` unit do::
+
+    sudo ceilometer-upgrade --skip-metering-database
+    sudo service ceilometer-agent-central start
+    sudo service ceilometer-agent-notification start
+    sudo service ceilometer-collector start
+
+Juju
+....
+Gnocchi can be installed using the charm at https://github.com/openstack-charmers/charm-gnocchi.
 
 Use
 ===
@@ -116,14 +107,14 @@ List the available metrics::
 
 Find the resource you want to analyze, for example of type `instance`::
 
-    $ gnocchi resource list -t instance -c id -c user_id -c flavor_name
-    +--------------------------------------+----------------------------------+-------------+
-    | id                                   | user_id                          | flavor_name |
-    +--------------------------------------+----------------------------------+-------------+
-    | 06e76595-4155-4bbc-a7ec-8ea99117f019 | cc0530ce0f98408c9732ab346dd05872 | m1.tiny     |
-    | 2e33d61a-b975-4768-b478-8da64de05f6c | cc0530ce0f98408c9732ab346dd05872 | m1.tiny     |
-    | dcaf2c23-1da7-4ca0-853c-541574323aed | 72a0254c67754b23b43ab0aae6524b50 | m1.medium   |
-    +--------------------------------------+----------------------------------+-------------+
+    $ gnocchi resource list -t instance -c id -c user_id -c flavor_id
+    +--------------------------------------+----------------------------------+-----------+
+    | id                                   | user_id                          | flavor_id |
+    +--------------------------------------+----------------------------------+-----------+
+    | 06e76595-4155-4bbc-a7ec-8ea99117f019 | cc0530ce0f98408c9732ab346dd05872 | 1         |
+    | 2e33d61a-b975-4768-b478-8da64de05f6c | cc0530ce0f98408c9732ab346dd05872 | 1         |
+    | dcaf2c23-1da7-4ca0-853c-541574323aed | 72a0254c67754b23b43ab0aae6524b50 | 2         |
+    +--------------------------------------+----------------------------------+-----------+
     
 View the resource usage of a specific resource::