diff --git a/orchestra/conf/project_template/project_name/settings.py b/orchestra/conf/project_template/project_name/settings.py
index b8669175..65885bc6 100644
--- a/orchestra/conf/project_template/project_name/settings.py
+++ b/orchestra/conf/project_template/project_name/settings.py
@@ -57,7 +57,6 @@ INSTALLED_APPS = [
     # Third-party apps
     'django_extensions',
     'djcelery',
-    'djcelery_email',
     'fluent_dashboard',
     'admin_tools',
     'admin_tools.theming',
diff --git a/scripts/containers/deploy.sh b/scripts/containers/deploy.sh
index 562d3f20..6b5a9e93 100644
--- a/scripts/containers/deploy.sh
+++ b/scripts/containers/deploy.sh
@@ -79,6 +79,7 @@ function install_orchestra () {
 function setup_database () {
     dev=$1
     noinput=$2
+    run sudo apt-get install -y postgresql python3-psycopg2
     # Setup Database
     if [[ $dev ]]; then
         # Speeding up tests, don't do this in production!
@@ -212,7 +213,8 @@ function main () {
         echo -e "\nErr. --repo only makes sense with --dev\n" >&2
         exit 5
     fi
-    
+
+    sudo true
     if [[ ! $noinput && ! $bproject_name ]]; then
         while true; do
             read -p "Enter a project name [panel]: " project_name
@@ -249,7 +251,9 @@ function main () {
     cd $home
     
     install_orchestra "$dev" $home $repo
-    surun "orchestra-admin startproject $project_name"
+    if [[ ! -e $project_name ]]; then
+        surun "orchestra-admin startproject $project_name"
+    fi
     cd $project_name
     setup_database "$dev" "$noinput"