diff --git a/docs/deploying.md b/docs/deploying.md
index 9934075ce..571fc0f37 100644
--- a/docs/deploying.md
+++ b/docs/deploying.md
@@ -75,17 +75,17 @@ as `my-ubuntu`, then pushes it to the local registry. Finally, the
 
 ## Stop a local registry
 
-To stop the registry, use the same `docker stop` command as with any other
+To stop the registry, use the same `docker container stop` command as with any other
 container.
 
 ```bash
-$ docker stop registry
+$ docker container stop registry
 ```
 
-To remove the container, use `docker rm`.
+To remove the container, use `docker container rm`.
 
 ```bash
-$ docker stop registry && docker rm -v registry
+$ docker container stop registry && docker container rm -v registry
 ```
 
 ## Basic configuration
@@ -204,7 +204,7 @@ If you have been issued an _intermediate_ certificate instead, see
 2.  Stop the registry if it is currently running.
 
     ```bash
-    $ docker stop registry
+    $ docker container stop registry
     ```
 
 3.  Restart the registry, directing it to use the TLS certificate. This command
@@ -415,7 +415,7 @@ secrets.
 2.  Stop the registry.
 
     ```bash
-    $ docker stop registry
+    $ docker container stop registry
     ```
 
 3.  Start the registry with basic authentication.
diff --git a/docs/index.md b/docs/index.md
index d91b799a8..d8ebf297e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -56,7 +56,7 @@ Pull (or build) some image from the hub
 
 Tag the image so that it points to your registry
 
-    docker tag ubuntu localhost:5000/myfirstimage
+    docker image tag ubuntu localhost:5000/myfirstimage
 
 Push it
 
@@ -68,7 +68,7 @@ Pull it back
 
 Now stop your registry and remove all data
 
-    docker stop registry && docker rm -v registry
+    docker container stop registry && docker container rm -v registry
 
 ## Next
 
diff --git a/docs/recipes/index.md b/docs/recipes/index.md
index f5d10390a..97d322698 100644
--- a/docs/recipes/index.md
+++ b/docs/recipes/index.md
@@ -17,7 +17,7 @@ At this point, it's assumed that:
  * you have installed Docker Compose
  * it's HIGHLY recommended that you get a certificate from a known CA instead of self-signed certificates
  * inside the current directory, you have a X509 `domain.crt` and `domain.key`, for the CN `myregistrydomain.com`
- * be sure you have stopped and removed any previously running registry (typically `docker stop registry && docker rm -v registry`)
+ * be sure you have stopped and removed any previously running registry (typically `docker container stop registry && docker container rm -v registry`)
 
 ## The List