diff --git a/start.sh b/start.sh
index dd2888a56b04bf5081eb49d81bdd41e12ada5a02..63f0bdb975ed9d9a294f559421ef7e08ec2d8523 100755
--- a/start.sh
+++ b/start.sh
@@ -39,6 +39,7 @@ function create {
     if [[ -f "web/profiles/contrib/config_installer/config_installer.info.yml" ]]; then
       # Start container
       a d4d up
+      sleep 2
       drush --no-interaction si config_installer
 
       # Init site config values
@@ -54,6 +55,12 @@ function create {
         git ignore "/*.sql"
         drush sql:dump --result-file ../db.sql
       fi
+
+      # Cleanup
+      if [[ -n ${L3D_CLEANUP} ]]; then
+        docker-compose stop
+        docker-compose rm --force
+      fi
     fi
   fi
   if [[ -n ${L3D_EXIT} ]]; then