diff --git a/.gitpod.yml b/.gitpod.yml
index 0bcba2dda..65508a04c 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -7,10 +7,10 @@ tasks:
       sed -i "s#APP_URL=http://localhost#APP_URL=$(gp url 80)#g" .env
       sed -i "s#GITPOD_VITE_URL=#GITPOD_VITE_URL=$(gp url 5173)#g" .env
       composer install --ignore-platform-reqs
-      ./vendor/bin/sail up -d
-      ./vendor/bin/sail php artisan key:generate
-      ./vendor/bin/sail php artisan storage:link
-      ./vendor/bin/sail php artisan migrate:fresh --seed
+      ./vendor/bin/spin up -d
+      ./vendor/bin/spin exec -u webuser coolify php artisan key:generate
+      ./vendor/bin/spin exec -u webuser coolify php artisan storage:link
+      ./vendor/bin/spin exec -u webuser coolify php artisan migrate:fresh --seed
       cat .coolify-logo
       gp sync-done sail-is-ready
 
@@ -18,14 +18,14 @@ tasks:
     command: |
       echo "Waiting for Sail environment to boot up."
       gp sync-await sail-is-ready
-      ./vendor/bin/sail npm install
-      ./vendor/bin/sail npm run dev
+      ./vendor/bin/spin exec vite npm install
+      ./vendor/bin/spin exec vite npm run dev
 
   - name: Laravel Queue Worker, listening to code changes
     command: |
       echo "Waiting for Sail environment to boot up."
       gp sync-await sail-is-ready
-      ./vendor/bin/sail php artisan queue:listen
+      ./vendor/bin/spin exec -u webuser coolify php artisan queue:listen
 
 ports:
   - port: 3306