diff --git a/tfgrid3/funkwhale/Dockerfile b/tfgrid3/funkwhale/Dockerfile
index da651ac0..9e5fb758 100644
--- a/tfgrid3/funkwhale/Dockerfile
+++ b/tfgrid3/funkwhale/Dockerfile
@@ -44,7 +44,7 @@ RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Expose ports for HTTP access
-EXPOSE 5000
+EXPOSE 80
 
 # Command to run Zinit in the container
 CMD ["/sbin/zinit", "init", "--container"]
diff --git a/tfgrid3/funkwhale/scripts/start-fk.sh b/tfgrid3/funkwhale/scripts/start-fk.sh
index b1c7ea9a..785c1916 100644
--- a/tfgrid3/funkwhale/scripts/start-fk.sh
+++ b/tfgrid3/funkwhale/scripts/start-fk.sh
@@ -4,8 +4,8 @@ set -ex
 # Check if FUNKWHALE_VERSION is set, if not, default to 1.4.0
 FUNKWHALE_VERSION=${FUNKWHALE_VERSION:-1.4.0}
 
-# Create and Change to Funkwhale directory
-mkdir /srv/funkwhale/
+# Change to Funkwhale directory
+mkdir -p /srv/funkwhale/
 cd /srv/funkwhale/
 
 # Download the Docker Compose and environment files for the specified version
@@ -21,26 +21,36 @@ sed -i "s#^DJANGO_SECRET_KEY=.*#DJANGO_SECRET_KEY=$DJANGO_SECRET#" .env
 
 # Add environment variables to the .env file
 sed -i "s#^FUNKWHALE_VERSION=.*#FUNKWHALE_VERSION=$FUNKWHALE_VERSION#" .env
-sed -i "s#^FUNKWHALE_HOSTNAME=.*#FUNKWHALE_HOSTNAME=$Domain#" .env
-sed -i 's/^FUNKWHALE_API_IP=.*/FUNKWHALE_API_IP=0.0.0.0/' .env
+sed -i "s#^FUNKWHALE_HOSTNAME=.*#FUNKWHALE_HOSTNAME=$domain#" .env
+sed -i "s#^FUNKWHALE_HOSTNAME=.*#FUNKWHALE_HOSTNAME=$FUNKWHALE_HOSTNAME#" .env
+sed -i "s#^FUNKWHALE_API_IP=.*#FUNKWHALE_API_IP=0.0.0.0#" .env
+sed -i 's/^FUNKWHALE_API_PORT=.*/FUNKWHALE_API_PORT=80/' .env
 
-# Setting SMTP Config
-bash /usr/local/bin/configure-smtp.sh
 # Pull the latest Docker images for Funkwhale
 docker-compose pull
 
 # Start PSQL service
 docker-compose up -d postgres
 
+# Waiting for postgres to be ready
+echo "[INFO] Waiting for PostgreSQL to be ready..."
+until docker-compose exec -T postgres pg_isready -U funkwhale > /dev/null 2>&1; do
+  echo "[INFO] PostgreSQL not ready yet. Retrying in 5s..."
+  sleep 5
+done
+
+echo "[SUCCESS] PostgreSQL is ready. Continuing..."
+
 # Run database migrations
 docker-compose run --rm api funkwhale-manage migrate
 
 # Create a superuser using the provided credentials
-docker-compose run --rm -T api funkwhale-manage fw users create --superuser <<EOF
-$FUNKWHALE_SUPERUSER_NAME
-$FUNKWHALE_SUPERUSER_PASSWORD
-$FUNKWHALE_SUPERUSER_EMAIL
-EOF
+USER_INPUT=$(printf "%s\n%s\n%s" \
+  "$FUNKWHALE_SUPERUSER_NAME" \
+  "$FUNKWHALE_SUPERUSER_PASSWORD" \
+  "$FUNKWHALE_SUPERUSER_EMAIL")
+
+echo "$USER_INPUT" | docker-compose run --rm -T api funkwhale-manage fw users create --superuser
 
 # Start Funkwhale services
 docker-compose up -d