diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index a92708c0..515a8530 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -65,22 +65,20 @@ class Deploy < ApplicationRecord
     lines = []
 
     time_start
-    Dir.chdir(site.path) do
-      Open3.popen2e(env, cmd, unsetenv_others: true) do |_, o, t|
-        # TODO: Enviar a un websocket para ver el proceso en vivo?
-        Thread.new do
-          o.each do |line|
-            lines << line
+    Open3.popen2e(env, cmd, unsetenv_others: true, chdir: site.path) do |_, o, t|
+      # TODO: Enviar a un websocket para ver el proceso en vivo?
+      Thread.new do
+        o.each do |line|
+          lines << line
 
-            puts line if output
-          end
-        rescue IOError => e
-          lines << e.message
-          puts e.message if output
+          puts line if output
         end
-
-        r = t.value
+      rescue IOError => e
+        lines << e.message
+        puts e.message if output
       end
+
+      r = t.value
     end
     time_stop
 
diff --git a/app/models/site.rb b/app/models/site.rb
index 24644b9c..81264a24 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -447,6 +447,10 @@ class Site < ApplicationRecord
     find_by(name: "#{Site.domain}.")
   end
 
+  def self.one_at_a_time
+    @@one_at_a_time ||= Thread::Mutex.new
+  end
+
   def reset
     @read = false
     @layouts = nil
@@ -553,7 +557,9 @@ class Site < ApplicationRecord
   end
 
   def run_in_path(&block)
-    Dir.chdir path, &block
+    Site.one_at_a_time.synchronize do
+      Dir.chdir path, &block
+    end
   end
 
   # Instala las gemas cuando es necesario: