diff --git a/docs/cloud-api/images/cloud-connections-user-1.png b/docs/cloud-api/images/cloud-connections-user-1.png
new file mode 100644
index 00000000000..d5d6f54fa54
Binary files /dev/null and b/docs/cloud-api/images/cloud-connections-user-1.png differ
diff --git a/docs/cloud-api/images/cloud-connections-user-2.png b/docs/cloud-api/images/cloud-connections-user-2.png
new file mode 100644
index 00000000000..561817b577a
Binary files /dev/null and b/docs/cloud-api/images/cloud-connections-user-2.png differ
diff --git a/docs/cloud-api/images/cloud-connections-user-3.png b/docs/cloud-api/images/cloud-connections-user-3.png
new file mode 100644
index 00000000000..77a50ac50cd
Binary files /dev/null and b/docs/cloud-api/images/cloud-connections-user-3.png differ
diff --git a/docs/cloud-api/images/cloud-connections-user-4.png b/docs/cloud-api/images/cloud-connections-user-4.png
new file mode 100644
index 00000000000..bd139fa6b24
Binary files /dev/null and b/docs/cloud-api/images/cloud-connections-user-4.png differ
diff --git a/docs/cloud-api/images/cloud-connections-user-5.png b/docs/cloud-api/images/cloud-connections-user-5.png
new file mode 100644
index 00000000000..45aa7b683e9
Binary files /dev/null and b/docs/cloud-api/images/cloud-connections-user-5.png differ
diff --git a/docs/cloud-api/images/cloud-connections-user-6.png b/docs/cloud-api/images/cloud-connections-user-6.png
new file mode 100644
index 00000000000..ad25c9b9fed
Binary files /dev/null and b/docs/cloud-api/images/cloud-connections-user-6.png differ
diff --git a/docs/cloud-api/images/cloud-connections-user-7.png b/docs/cloud-api/images/cloud-connections-user-7.png
new file mode 100644
index 00000000000..aca12514f3b
Binary files /dev/null and b/docs/cloud-api/images/cloud-connections-user-7.png differ
diff --git a/docs/cloud-api/user-guide.md b/docs/cloud-api/user-guide.md
index a962c072bc5..df06472fc23 100644
--- a/docs/cloud-api/user-guide.md
+++ b/docs/cloud-api/user-guide.md
@@ -12,19 +12,19 @@ The involved steps are the following
 
 1. Open the Cloud Connections section of the Web UI:
 
-    ![cloud-connections](https://s3-us-west-2.amazonaws.com/kura-repo/kura-github-wiki-images/generic-cloud-services/cloud-connections-user-1.png)
+    ![cloud-connections](images/cloud-connections-user-1.png)
 
 2. Create a new Cloud Connection
 
     1. Click on the **New Connection** button
 
-        ![cloud-connections](https://s3-us-west-2.amazonaws.com/kura-repo/kura-github-wiki-images/generic-cloud-services/cloud-connections-user-2.png)
+        ![cloud-connections](images/cloud-connections-user-2.png)
 
     2. Enter a new unique identifier in the **Cloud Connection Service** PID field. The identifier must be a valid `kura.service.pid` and, in case of a Kapua Cloud Connection, it must start with the `org.eclipse.kura.cloud.CloudService-` prefix. A valid identifier can be `org.eclipse.kura.cloud.CloudService-KAPUA`. As an alternative it is possible to reconfigure the existing `org.eclipse.kura.cloud.CloudService` Cloud Connection.
 
     3. Configure the `MQTTDataTrasport` service.
 
-        ![cloud-connections](https://s3-us-west-2.amazonaws.com/kura-repo/kura-github-wiki-images/generic-cloud-services/cloud-connections-user-3.png)
+        ![cloud-connections](images/cloud-connections-user-3.png)
 
         Click on the `MQTTDataTrasport-KAPUA` tab and fill the parameters required for establishing the MQTT connection:
 
@@ -35,7 +35,7 @@ The involved steps are the following
 
     4. Configure the `DataService-KAPUA` service.
 
-        ![cloud-connections](https://s3-us-west-2.amazonaws.com/kura-repo/kura-github-wiki-images/generic-cloud-services/cloud-connections-user-4.png)
+        ![cloud-connections](images/cloud-connections-user-4.png)
 
         In order to enable automatic connection, set the `Connect Auto-on-startup` parameter to `true`
 
@@ -45,7 +45,7 @@ The involved steps are the following
 
 2. Click on the **New Pub/Sub** button.
 
-    ![cloud-connections](https://s3-us-west-2.amazonaws.com/kura-repo/kura-github-wiki-images/generic-cloud-services/cloud-connections-user-5.png)
+    ![cloud-connections](images/cloud-connections-user-5.png)
 
 3. Select the type of component to be created, from the **Available Publisher/Subscriber factories** drop down list, in order to create a Publisher
 select the `org.eclipse.kura.cloud.publisher.CloudPublisher` entry.
@@ -54,7 +54,7 @@ select the `org.eclipse.kura.cloud.publisher.CloudPublisher` entry.
 
 5. Click **Apply**, you should see the publisher configuration
 
-    ![cloud-connections](https://s3-us-west-2.amazonaws.com/kura-repo/kura-github-wiki-images/generic-cloud-services/cloud-connections-user-6.png)
+    ![cloud-connections](images/cloud-connections-user-6.png)
 
 6. Select and configure the newly created publisher instance, and then click **Apply**
 
@@ -66,6 +66,6 @@ select the `org.eclipse.kura.cloud.publisher.CloudPublisher` entry.
 
 3. Click on the **Select available targets** link and select the desired Publisher instance to bind to.
 
-    ![cloud-connections](https://s3-us-west-2.amazonaws.com/kura-repo/kura-github-wiki-images/generic-cloud-services/cloud-connections-user-7.png)
+    ![cloud-connections](images/cloud-connections-user-7.png)
 
 4. Click on **Apply**
diff --git a/docs/references/javadoc.md b/docs/references/javadoc.md
index fd28a3319ad..be3bf4396e7 100644
--- a/docs/references/javadoc.md
+++ b/docs/references/javadoc.md
@@ -1,6 +1,6 @@
 # Javadoc
 
-- [Kura API Documentation](https://download.eclipse.org/kura/docs/api/5.2.0/apidocs/).
+- [Kura API Documentation](https://download.eclipse.org/kura/docs/api/5.4.0/apidocs/).
 - [Java Communications API (javax.comm)](http://docs.oracle.com/cd/E17802_01/products/products/javacomm/reference/api/).
 - [Java USB (javax.usb)](http://javax-usb.sourceforge.net/jdoc/).
 - [Java HIDAPI Javadoc](http://kura-resources.s3.amazonaws.com/javadocs/hidapi-1.1-javadoc/index.html).