diff --git a/engine/reference/commandline/app.md b/engine/reference/commandline/app.md
index ce4144cc58..79d12adaf6 100644
--- a/engine/reference/commandline/app.md
+++ b/engine/reference/commandline/app.md
@@ -383,7 +383,7 @@ pushing an official Docker image as part of your app, you may find your app
 bundle becomes large with all image architectures embedded. To just push the
 architecture required, you can add the `--platform` flag.
 
-```bash
+```console
 $ docker login 
 
 $ docker app push my-app --platform="linux/amd64" --tag <hub-id>/<repo>:0.1.0
diff --git a/engine/release-notes/18.09.md b/engine/release-notes/18.09.md
index 7f1202408a..d26b1f849b 100644
--- a/engine/release-notes/18.09.md
+++ b/engine/release-notes/18.09.md
@@ -188,8 +188,8 @@ In Docker versions prior to 18.09, containerd was managed by the Docker engine d
 
 Run the following command to get the current value of the `MountFlags` property for the `docker.service`:
 
-```bash
-sudo systemctl show --property=MountFlags docker.service
+```console
+$ sudo systemctl show --property=MountFlags docker.service
 MountFlags=
 ```
 Update your configuration if this command prints a non-empty value for `MountFlags`, and restart the docker service.
@@ -244,8 +244,8 @@ configuration which changes mount settings (for example, `MountFlags=slave`) bre
 
 Run the following command to get the current value of the `MountFlags` property for the `docker.service`:
 
-```bash
-sudo systemctl show --property=MountFlags docker.service
+```console
+$ sudo systemctl show --property=MountFlags docker.service
 MountFlags=
 ```
 
diff --git a/engine/scan/index.md b/engine/scan/index.md
index 40f938c6d2..4ee07235b7 100644
--- a/engine/scan/index.md
+++ b/engine/scan/index.md
@@ -21,20 +21,20 @@ This page contains information about the `docker scan` CLI command. For informat
 
 The `docker scan` command allows you to scan existing Docker images using the image name or ID.  For example, run the following command to scan the hello-world image:
 
-```shell
-$  docker scan hello-world
+```console
+$ docker scan hello-world
 
-  Testing hello-world...
+Testing hello-world...
 
-  Organization:      docker-desktop-test
-  Package manager:   linux
-  Project name:      docker-image|hello-world
-  Docker image:      hello-world
-  Licenses:          enabled
+Organization:      docker-desktop-test
+Package manager:   linux
+Project name:      docker-image|hello-world
+Docker image:      hello-world
+Licenses:          enabled
 
-  ✓ Tested 0 dependencies for known issues, no vulnerable paths found.
+✓ Tested 0 dependencies for known issues, no vulnerable paths found.
 
-  Note that we do not currently have vulnerability data for your image.
+Note that we do not currently have vulnerability data for your image.
 ```
 
 ### Get a detailed scan report
@@ -43,7 +43,7 @@ You can get a detailed scan report about a Docker image by providing the Dockerf
 
 For example, if you apply the option to the `docker-scan` test image, it displays the following result:
 
-```shell
+```console
 $ docker scan --file Dockerfile docker-scan:e2e
 Testing docker-scan:e2e
 ...
@@ -74,7 +74,7 @@ According to our scan, you are currently using the most secure version of the se
 
 When using docker scan with the `--file` flag, you can also add the `--exclude-base` tag. This excludes the base image (specified in the Dockerfile using the `FROM` directive) vulnerabilities from your report. For example:
 
-```shell
+```console
 $ docker scan --file Dockerfile --exclude-base docker-scan:e2e
 Testing docker-scan:e2e
 ...
@@ -105,7 +105,7 @@ Tested 200 dependencies for known issues, found 16 issues.
 
 You can also display the scan result as a JSON output by adding the `--json` flag to the command. For example:
 
-```shell
+```console
 $ docker scan --json hello-world
 {
   "vulnerabilities": [],
@@ -158,7 +158,7 @@ $ docker scan --json hello-world
 
 In addition to the `--json` flag, you can also use the `--group-issues` flag to display a vulnerability only once in the scan report:
 
-```shell
+```console
 $ docker scan --json --group-issues docker-scan:e2e
 {
     {
@@ -211,7 +211,7 @@ You can find all the sources of the vulnerability in the `from` section.
 
 To view the dependency tree of your image, use the --dependency-tree flag. This displays all the dependencies before the scan result. For example:
 
-```shell
+```console
 $ docker scan --dependency-tree debian:buster
 
 $ docker-image|99138c65ebc7 @ latest
@@ -322,7 +322,7 @@ Tested 200 dependencies for known issues, found 37 issues.
 
 If you have an existing Snyk account, you can directly use your Snyk [API token](https://app.snyk.io/account){: target="_blank" rel="noopener" class="_"}:
 
-```shell
+```console
 $ docker scan --login --token SNYK_AUTH_TOKEN
 
 Your account has been authenticated. Snyk is now ready to be used.
@@ -347,7 +347,7 @@ To run vulnerability scanning on your Docker images, you must meet the following
 
 Check your installation by running `docker scan --version`, it should print the current version of docker scan and the Snyk engine version. For example:
 
-```shell
+```console
 $ docker scan --version
 Version:    v0.5.0
 Git commit: 5a09266
diff --git a/engine/tutorials/networkingcontainers.md b/engine/tutorials/networkingcontainers.md
index 85cfd3d7b9..d6660e5a3f 100644
--- a/engine/tutorials/networkingcontainers.md
+++ b/engine/tutorials/networkingcontainers.md
@@ -37,7 +37,7 @@ The network named `bridge` is a special network. Unless you tell it otherwise, D
 
 Inspecting the network is an easy way to find out the container's IP address.
 
-```bash
+```console
 $ docker network inspect bridge
 
 [