diff --git a/doc/installation/docker/arm_docker.md b/doc/installation/docker/arm_docker.md
index e7ee293..f21f5a5 100644
--- a/doc/installation/docker/arm_docker.md
+++ b/doc/installation/docker/arm_docker.md
@@ -8,5 +8,6 @@ GitHub repo:
 docker run -d --privileged \
 -v lr_var:/var/lib/iotronic -v lr_le:/etc/letsencrypt/ \
 -v lr_nginx:/etc/nginx -v lr_confs:/etc/iotronic/ \
+-v /etc/passwd:/etc/passwd -v /etc/shadow:/etc/shadow \
 --net=host --restart unless-stopped --name=lightning-rod mdslab/arm-openstack-iotronic-lightning-rod
 ```
diff --git a/doc/installation/docker/x86_64_docker.md b/doc/installation/docker/x86_64_docker.md
index 9ab1822..cfe01e9 100644
--- a/doc/installation/docker/x86_64_docker.md
+++ b/doc/installation/docker/x86_64_docker.md
@@ -8,5 +8,6 @@ GitHub repo:
 docker run -d --privileged \
 -v lr_var:/var/lib/iotronic -v lr_le:/etc/letsencrypt/ \
 -v lr_nginx:/etc/nginx -v lr_confs:/etc/iotronic/ \
+-v /etc/passwd:/etc/passwd -v /etc/shadow:/etc/shadow \
 --net=host --restart unless-stopped --name=lightning-rod mdslab/openstack-iotronic-lightning-rod
 ```
diff --git a/doc/installation/raspberry_pi_3.rst b/doc/installation/raspberry_pi_3.rst
index caecf36..5041e6c 100644
--- a/doc/installation/raspberry_pi_3.rst
+++ b/doc/installation/raspberry_pi_3.rst
@@ -10,7 +10,7 @@ Requirements
 
 ::
 
-   apt install python3 python3-setuptools python3-pip gdb lsof
+   apt install python3 python3-setuptools python3-pip gdb lsof libssl-dev libffi-dev libffi-dev
 
 * NodeJS
 
@@ -35,6 +35,8 @@ Requirements
 
     apt install -y nginx
     sed -i 's/# server_names_hash_bucket_size 64;/server_names_hash_bucket_size 64;/g' /etc/nginx/nginx.conf
+    sed -i "s|listen 80 default_server;|listen 50000 default_server;|g" /etc/nginx/sites-available/default
+    sed -i "s|80 default_server;|50000 default_server;|g" /etc/nginx/sites-available/default
 
 * Certbot
 
@@ -55,15 +57,34 @@ Iotronic deployment
 
     lr_install
 
+Execution:
+~~~~~~~~~~
+::
+
+    systemctl start lightning-rod.service
+
+    tail -f /var/log/iotronic/lightning-rod.log
 
 Iotronic setup
 ''''''''''''''
+- Web-UI configuration:
+
+::
+
+    http://<BOARD-IP>:1474/config
+
+Registration Agent URL: ws(s)://<IOTRONIC-CROSSBAR-IP>:<IOTRONIC-CROSSBAR-PORT>/
+Registration Code: <REGISTRATION-CODE>
+
+
+- Manual configuration (first registration only)
+
 ::
 
     lr_configure
 
 Arguments required:
-   * <REGISTRATION-TOKEN> , token released by IoTronic registration procedure
+   * <REGISTRATION-CODE> , token released by IoTronic registration procedure
    * <WAMP-REG-AGENT-URL> , IoTronic Crossbar server WAMP URL:
 
    ws(s)://<IOTRONIC-CROSSBAR-IP>:<IOTRONIC-CROSSBAR-PORT>/
@@ -73,15 +94,6 @@ e.g.
 
     lr_configure <REGISTRATION-TOKEN> <WAMP-REG-AGENT-URL>
 
-Execution:
-~~~~~~~~~~
-::
-
-    systemctl start lightning-rod.service
-
-    tail -f /var/log/iotronic/lightning-rod.log
-
-
 Troubleshooting:
 ~~~~~~~~~~~~~~~~
 - **cbor error:** "Connection failed: RuntimeError: could not create serializer for "cbor"
@@ -89,4 +101,4 @@ Troubleshooting:
    It is a dependency of Autobahn package
 
  **Solution:**
-   pip3 install cbor
\ No newline at end of file
+   pip3 install cborregistration only)
\ No newline at end of file
diff --git a/doc/installation/ubuntu1604.rst b/doc/installation/ubuntu1604.rst
index 167807b..002958d 100644
--- a/doc/installation/ubuntu1604.rst
+++ b/doc/installation/ubuntu1604.rst
@@ -11,7 +11,7 @@ Requirements
 
 ::
 
-   apt install python3 python3-setuptools python3-pip gdb lsof libssl-dev
+   apt install python3 python3-setuptools python3-pip gdb lsof libssl-dev libffi-dev
 
 * NodeJS
 
@@ -36,12 +36,17 @@ Requirements
 
     apt install -y nginx
     sed -i 's/# server_names_hash_bucket_size 64;/server_names_hash_bucket_size 64;/g' /etc/nginx/nginx.conf
+    sed -i "s|listen 80 default_server;|listen 50000 default_server;|g" /etc/nginx/sites-available/default
+    sed -i "s|80 default_server;|50000 default_server;|g" /etc/nginx/sites-available/default
+
 
 * Certbot
 
 ::
-
+    add-apt-repository ppa:certbot/certbot
+    apt update
     apt-get install python-certbot-nginx
+    systemctl restart nginx
 
 
 Install Lightning-rod
@@ -56,15 +61,34 @@ Iotronic deployment
 
     lr_install
 
+Execution:
+~~~~~~~~~~
+::
+
+    systemctl start lightning-rod.service
+
+    tail -f /var/log/iotronic/lightning-rod.log
 
 Iotronic setup
 ''''''''''''''
+- Web-UI configuration:
+
+::
+
+    http://<BOARD-IP>:1474/config
+
+Registration Agent URL: ws(s)://<IOTRONIC-CROSSBAR-IP>:<IOTRONIC-CROSSBAR-PORT>/
+Registration Code: <REGISTRATION-CODE>
+
+
+- Manual configuration (first registration only)
+
 ::
 
     lr_configure
 
 Arguments required:
-   * <REGISTRATION-TOKEN> , token released by IoTronic registration procedure
+   * <REGISTRATION-CODE> , token released by IoTronic registration procedure
    * <WAMP-REG-AGENT-URL> , IoTronic Crossbar server WAMP URL:
 
    ws(s)://<IOTRONIC-CROSSBAR-IP>:<IOTRONIC-CROSSBAR-PORT>/
@@ -74,15 +98,6 @@ e.g.
 
     lr_configure <REGISTRATION-TOKEN> <WAMP-REG-AGENT-URL>
 
-Execution:
-~~~~~~~~~~
-::
-
-    systemctl start lightning-rod.service
-
-    tail -f /var/log/iotronic/lightning-rod.log
-
-
 Troubleshooting:
 ~~~~~~~~~~~~~~~~
 - **cbor error:** "Connection failed: RuntimeError: could not create serializer for "cbor"
@@ -90,4 +105,4 @@ Troubleshooting:
    It is a dependency of Autobahn package
 
  **Solution:**
-   pip3 install cbor
\ No newline at end of file
+   pip3 install cborregistration only)
\ No newline at end of file