diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh
index 6e2767c6d..7643d30a6 100644
--- a/baseimage/initializeBaseUbuntuImage.sh
+++ b/baseimage/initializeBaseUbuntuImage.sh
@@ -39,7 +39,6 @@ apt-get -y install \
     nginx-full \
     openssh-server \
     pwgen \
-    rcconf \
     swaks \
     unattended-upgrades \
     unbound \
diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup
index b37c05170..7d1840f8f 100755
--- a/scripts/cloudron-setup
+++ b/scripts/cloudron-setup
@@ -91,8 +91,9 @@ if [[ ${EUID} -ne 0 ]]; then
 fi
 
 # Only --help works with mismatched ubuntu
-if [[ $(lsb_release -rs) != "16.04" ]]; then
-    echo "Cloudron requires Ubuntu 16.04" > /dev/stderr
+ubuntu_version=$(lsb_release -rs)
+if [[ "${ubuntu_version}" != "16.04" && "${ubuntu_version}" != "18.04" ]]; then
+    echo "Cloudron requires Ubuntu 16.04 or 18.04" > /dev/stderr
     exit 1
 fi