diff --git a/app/jobs/deploy_job.rb b/app/jobs/deploy_job.rb
index 98e474a..e5e051c 100644
--- a/app/jobs/deploy_job.rb
+++ b/app/jobs/deploy_job.rb
@@ -8,13 +8,20 @@ class DeployJob < ApplicationJob
   def perform(site, notify = true)
     ActiveRecord::Base.connection_pool.with_connection do
       @site = Site.find(site)
-      @site.update_attribute :status, 'building'
+
+      # Si ya hay una tarea corriendo, aplazar esta
+      if @site.status == 'building'
+        DeployJob.perform_in(60, site, notify)
+        return
+      end
+
+      @site.update status: 'building'
       # Asegurarse que DeployLocal sea el primero!
       @deployed = { deploy_local: deploy_locally }
 
       # No es opcional
       unless @deployed[:deploy_local]
-        @site.update_attribute :status, 'waiting'
+        @site.update status: 'waiting'
         notify_usuaries if notify
 
         # Hacer fallar la tarea
@@ -23,7 +30,7 @@ class DeployJob < ApplicationJob
 
       deploy_others
       notify_usuaries if notify
-      @site.update_attribute :status, 'waiting'
+      @site.update status: 'waiting'
     end
   end
   # rubocop:enable Metrics/MethodLength