diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 9e4fa34277..c8697ac930 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -19,10 +19,10 @@ a separate package.
 settings.  Don't forget to restore your memory setting and be prepared to
 provision.
 
-For macOS users, please use `Docker for Mac`_. Previous Mac-based tools (e.g.
-boot2docker) are *not* supported. Please be aware that the `licensing terms`_ for
-Docker for Mac (aka Docker Desktop) may mean that it is no longer
-free for your organization's use.
+For macOS users, please use `Docker for Mac`_, which comes with ``docker
+compose``. Previous Mac-based tools (e.g. boot2docker) are *not* supported.
+Please be aware that the `licensing terms`_ for Docker for Mac (aka Docker
+Desktop) may mean that it is no longer free for your organization's use.
 
 Since a Docker-based devstack runs many containers,
 you should configure Docker with a sufficient
@@ -32,9 +32,14 @@ does work.
 
 `Docker for Windows`_ may work but has not been tested and is *not* supported.
 
-If you are using Linux, use the ``overlay2`` storage driver, kernel version
-4.0+ and *not* ``overlay``. To check which storage driver your
-``docker-daemon`` uses, run the following command.
+If you are using Linux, developers on Ubuntu (and Debian) should ensure
+they've uninstalled docker.io and docker-compose from the main Ubuntu
+repositories and instead install docker-ce and docker-compose-plugin from the
+official Docker package repository:
+https://docs.docker.com/engine/install/ubuntu/. Also they should use the
+``overlay2`` storage driver, kernel version 4.0+ and *not* ``overlay``. To
+check which storage driver your ``docker-daemon`` uses, run the following
+command.
 
 .. code:: sh