diff --git a/README.md b/README.md
index 628a5d58..060bd2ba 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ The recommended deployment of Mailtrain would use 3 DNS entries that all points
 
 
 
-### Installation on fresh CentOS 7 (public website secured by SSL)
+### Installation on fresh CentOS 7 or Ubuntu 18.04 LTS (public website secured by SSL)
 
 This will setup a publicly accessible Mailtrain instance. All endpoints (trusted, sandbox, public) will provide both HTTP (on port 80)
 and HTTPS (on port 443). The HTTP ports just issue HTTP redirect to their HTTPS counterparts.
@@ -69,10 +69,17 @@ Thus, by running this script below, you agree with the Let's Encrypt's Terms of
 
 4. Run the installation script. Replace the urls and your email address with the correct values. **NOTE** that running this script you agree
    Let's Encrypt's conditions.
+
+   For Centos 7 type:
     ```
     sh setup/install-centos7-https.sh mailtrain.example.com sbox.mailtrain.example.com lists.example.com admin@example.com
     ```
 
+   For Ubuntu 18.04 LTS type:
+    ```
+    sh setup/install-ubuntu1804-https.sh mailtrain.example.com sbox.mailtrain.example.com lists.example.com admin@example.com
+    ```
+
 5. Start Mailtrain and enable to be started by default when your server starts.
     ```
     systemctl start mailtrain
@@ -90,7 +97,7 @@ Thus, by running this script below, you agree with the Let's Encrypt's Terms of
 10. If you intend to sign your email by DKIM, set the DKIM key and DKIM selector under Administration/Send Configurations.
 
 
-### Installation on fresh CentOS 7 (local installation)
+### Installation on fresh CentOS 7 or Ubuntu 18.04 LTS (local installation)
 
 This will setup a locally accessible Mailtrain instance (primarily for development and testing).
 All endpoints (trusted, sandbox, public) will provide only HTTP as follows:
@@ -118,10 +125,17 @@ All endpoints (trusted, sandbox, public) will provide only HTTP as follows:
 
 4. Run the installation script. Replace the urls and your email address with the correct values. **NOTE** that running this script you agree
    Let's Encrypt's conditions.
+
+   For Centos 7 type:
     ```
     sh setup/install-centos7-local.sh
     ```
 
+   For Ubuntu 18.04 LTS type:
+    ```
+    sh setup/install-ubuntu1804-local.sh
+    ```
+
 5. Start Mailtrain and enable to be started by default when your server starts.
     ```
     systemctl start mailtrain
diff --git a/setup/functions b/setup/functions
index 8cd47ee1..72b73150 100644
--- a/setup/functions
+++ b/setup/functions
@@ -1,6 +1,6 @@
 # This is not a standalone script. It provides common functions to server-*.sh scripts
 
-local hostType="$1"
+hostType="$1"
 
 case "$hostType" in
     centos7)
diff --git a/setup/install-ubuntu1804-local.sh b/setup/install-ubuntu1804-local.sh
index 14d650a4..b8578b7b 100644
--- a/setup/install-ubuntu1804-local.sh
+++ b/setup/install-ubuntu1804-local.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+set -x
 
 SCRIPT_PATH=$(dirname $(realpath -s $0))
 . $SCRIPT_PATH/functions ubuntu1804