diff --git a/01.Get-started/02.Deploy-an-application-update/completed_first_deployment.png b/01.Get-started/02.Deploy-an-application-update/completed_first_deployment.png
index 7966ef8fe..a158133f9 100644
Binary files a/01.Get-started/02.Deploy-an-application-update/completed_first_deployment.png and b/01.Get-started/02.Deploy-an-application-update/completed_first_deployment.png differ
diff --git a/01.Get-started/02.Deploy-an-application-update/create_deployment_group.png b/01.Get-started/02.Deploy-an-application-update/create_deployment_group.png
index 29b2af9a2..c81a8310b 100644
Binary files a/01.Get-started/02.Deploy-an-application-update/create_deployment_group.png and b/01.Get-started/02.Deploy-an-application-update/create_deployment_group.png differ
diff --git a/01.Get-started/02.Deploy-an-application-update/device_actions_create.png b/01.Get-started/02.Deploy-an-application-update/device_actions_create.png
index 961ab804f..1c6208b3d 100644
Binary files a/01.Get-started/02.Deploy-an-application-update/device_actions_create.png and b/01.Get-started/02.Deploy-an-application-update/device_actions_create.png differ
diff --git a/01.Get-started/02.Deploy-an-application-update/docs.md b/01.Get-started/02.Deploy-an-application-update/docs.md
index cd1e8cda9..e24a7d15a 100644
--- a/01.Get-started/02.Deploy-an-application-update/docs.md
+++ b/01.Get-started/02.Deploy-an-application-update/docs.md
@@ -25,9 +25,7 @@ In the Device information view for the device you just connected, select **Creat
 
 ![create a deployment for this device](device_actions_create.png)
 
-This will start the deployment wizard. The first step is to **Select a device group
-to target**. As we have not yet created any specific groups the only
-option presented should be **All devices**.
+This will start the deployment wizard. First notice that the device is already selected in the **Select a device group to target** section.
 
 ![create a deployment](create_deployment_group.png)
 
@@ -48,7 +46,7 @@ server.
 
 ![congratulations device](completed_first_deployment.png)
 
-!!! If you close the previous tooltip, you can still get the IP address. Then, you will need to append the port **85** to the browser's URL.
+!!! Then, you will need to append the port **85** to the browser's URL.
 !!! For a Raspberry Pi connected by following [Prepare a Raspberry Pi device](../01.Preparation/01.Prepare-a-Raspberry-Pi-device/docs.md),
 !!! you can run `$ hostname -I` inside your RaspberryPi terminal.
 !!! For a virtual device, connected by following [Prepare a virtual device](../01.Preparation/02.Prepare-a-virtual-device/docs.md),
diff --git a/01.Get-started/03.Deploy-an-operating-system-update/docs.md b/01.Get-started/03.Deploy-an-operating-system-update/docs.md
index 7d850476b..260785592 100644
--- a/01.Get-started/03.Deploy-an-operating-system-update/docs.md
+++ b/01.Get-started/03.Deploy-an-operating-system-update/docs.md
@@ -19,6 +19,9 @@ You should:
 * have completed [Deploy an application update](../02.Deploy-an-application-update/docs.md)
 * know the IP address of your device
 
+! Currently `mender-artifact snapshot` funtionality does not work with Mender Client 4.0 
+! as the `mender` util was splitted in multiple components, see 
+! [Mender snapshot](../../06.Artifact-creation/02.Create-an-Artifact-with-system-snapshot/docs.md) for more details.
 
 ### Step 1 - Download the mender-artifact utility on your workstation