diff --git a/.gitignore b/.gitignore
index e8f01eef70e23eb76bb95f9e9ac92a4bdf5344de..70b7265051b5eabb1ba4322942867f6cc58b41b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ data*
 
 # DB conf
 services/webapp/db_conf.sh
-services/proxy/certificates
 
 # Compose
 docker-compose.yml
diff --git a/services/proxy/prestartup_proxy.sh b/services/proxy/prestartup_proxy.sh
index aac3083f5eb394ddd2061a5072ccba958d0b91bd..38918c7f32200e55b37890dee1e551e3ed46e8d2 100644
--- a/services/proxy/prestartup_proxy.sh
+++ b/services/proxy/prestartup_proxy.sh
@@ -39,11 +39,14 @@ sudo sed -i "s/__ROSETTA_HOST__/$ROSETTA_HOST/g" /etc/apache2/sites-available/pr
 #-----------------------
 
 # If the tasks host is equal to rosetta host or not set, do nothing as we have already habdled it above
-if [ "x$ROSETTA_TASKS_PROXY_HOST" == "x$ROSETTA_HOST"] || [ "x$ROSETTA_TASKS_PROXY_HOST" == "x" ]; then
+if [ "x$ROSETTA_TASKS_PROXY_HOST" == "x$ROSETTA_HOST" ] || [ "x$ROSETTA_TASKS_PROXY_HOST" == "x" ]; then
     echo "[INFO] Not setting up certificates forRosetta tasks host as qual to Rosetta main host"
     ROSETTA_TASKS_PROXY_HOST=$ROSETTA_HOST
 else
 
+    # Always create dir if not existent
+    mkdir -p /etc/letsencrypt/live/$ROSETTA_TASKS_PROXY_HOST/
+
     # If there are no certificates, use snakeoils
 	if [ ! -f "/etc/letsencrypt/live/$ROSETTA_TASKS_PROXY_HOST/cert.pem" ]; then
 	    echo "Using default self-signed certificate cer file for $ROSETTA_TASKS_PROXY_HOST as not existent..."