diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb2766d3..2649c3ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 .apk-add: &apk-add
-- "apk add go-task diffutils"
+- "apk add go-task diffutils gitlab_ci_log_section"
 .disable-hainish: &disable-hainish
 - "rm -f .env.development"
 .cache-ruby: &cache-ruby
@@ -30,13 +30,18 @@ assets:
   - *cache-node
   - *cache-task
   before_script:
+  - "gitlab_ci_log_section --name git --header=\"Configuring git\""
   - "git config --global user.email \"${GIT_USER_EMAIL:-$GITLAB_USER_EMAIL}\""
   - "git config --global user.name \"${GIT_USER_NAME:-$GITLAB_USER_NAME}\""
   - "git remote set-url --push origin \"https://${GITLAB_USERNAME}:${GITLAB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git\""
+  - "gitlab_ci_log_section --name git --end"
+  - "gitlab_ci_log_section --name apk --header=\"Installing dependencies\""
   - "apk add brotli"
   - *apk-add
   - *disable-hainish
+  - "gitlab_ci_log_section --name apk --end"
   script:
+  - "gitlab_ci_log_section --name assets --header=\"Building\""
   - "go-task assets"
   after_script:
   - "git add public && git commit -m \"ci: assets [skip ci]\""
diff --git a/app/controllers/active_storage/direct_uploads_controller_decorator.rb b/app/controllers/active_storage/direct_uploads_controller_decorator.rb
index 5ac58ecf..94070882 100644
--- a/app/controllers/active_storage/direct_uploads_controller_decorator.rb
+++ b/app/controllers/active_storage/direct_uploads_controller_decorator.rb
@@ -18,7 +18,8 @@ module ActiveStorage
       # para que puedan propagarse correctamente a través de todo el
       # stack.
       def blob_args
-        params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, metadata: {}).to_h.symbolize_keys.tap do |ba|
+        params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type,
+                                     metadata: {}).to_h.symbolize_keys.tap do |ba|
           ba[:filename] = ba[:filename].unicode_normalize.sub(/\A_+/, '')
         end
       end
diff --git a/app/controllers/api/v1/webhooks/social_inbox_controller.rb b/app/controllers/api/v1/webhooks/social_inbox_controller.rb
index c71c4922..1ffc1596 100644
--- a/app/controllers/api/v1/webhooks/social_inbox_controller.rb
+++ b/app/controllers/api/v1/webhooks/social_inbox_controller.rb
@@ -38,21 +38,33 @@ module Api
           head :accepted
         end
 
-        # Cuando aprobamos una actividad, recibimos la confirmación y
-        # cambiamos el estado.
+        # Cuando la Social Inbox acepta una actividad, la recibimos
+        # igual y la guardamos por si cambiamos de idea.
+        #
+        # @todo DRY
         def onapproved
           ActivityPub.transaction do
-            activity_pub.approve! if activity_pub.waiting?
+            actor.present?
+            instance.present?
+            object.present?
+            activity.present?
+            activity_pub.approve!
           end
 
           head :accepted
         end
 
-        # Cuando rechazamos una actividad, recibimos la confirmación y
-        # cambiamos el estado
+        # Cuando la Social Inbox rechaza una actividad, la recibimos
+        # igual y la guardamos por si cambiamos de idea.
+        #
+        # @todo DRY
         def onrejected
           ActivityPub.transaction do
-            activity_pub.reject! if activity_pub.waiting?
+            actor.present?
+            instance.present?
+            object.present?
+            activity.present?
+            activity_pub.reject!
           end
 
           head :accepted
diff --git a/app/jobs/gitlab_notifier_job.rb b/app/jobs/gitlab_notifier_job.rb
index 308adfc7..77e865a3 100644
--- a/app/jobs/gitlab_notifier_job.rb
+++ b/app/jobs/gitlab_notifier_job.rb
@@ -105,7 +105,7 @@ class GitlabNotifierJob < ApplicationJob
   def title
     @title ||= ''.dup.tap do |t|
       t << "[#{exception.class}] " unless javascript?
-      t << exception.message
+      t << exception.message[0..200]
       t << " [#{issue_data[:count]}]"
     end
   end
diff --git a/app/models/activity_pub.rb b/app/models/activity_pub.rb
index df8e5c5c..217c15a1 100644
--- a/app/models/activity_pub.rb
+++ b/app/models/activity_pub.rb
@@ -21,8 +21,6 @@ class ActivityPub < ApplicationRecord
   aasm do
     # Todavía no hay una decisión sobre el objeto
     state :paused, initial: true
-    # Estamos esperando respuesta desde la Social Inbox
-    state :waiting
     # Le usuarie aprobó el objeto
     state :approved
     # Le usuarie rechazó el objeto
@@ -46,17 +44,22 @@ class ActivityPub < ApplicationRecord
     # Si un objeto previamente aprobado fue actualizado, volvemos a
     # pausarlo.
     event :pause do
-      transitions from: %i[waiting approved rejected], to: :paused
+      transitions from: %i[approved rejected], to: :paused
     end
 
     # La actividad se aprueba
     event :approve do
-      transitions from: :waiting, to: :approved
+      transitions from: %i[paused rejected], to: :approved
     end
 
     # La actividad fue rechazada
     event :reject do
-      transitions from: :waiting, to: :rejected
+      transitions from: %i[paused approved], to: :rejected
+    end
+
+    # Solo podemos reportarla luego de rechazarla
+    event :report do
+      transitions from: :rejected, to: :reported
     end
   end
 end
diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index addb817d..bc89a8b6 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -130,7 +130,7 @@ class DeployDistributedPress < Deploy
   #
   # @return [nil]
   def create_remote_site!
-    self.hostname = site.hostname
+    self.hostname ||= site.hostname
 
     created_site = site_client.create(create_site)
 
diff --git a/app/models/site/repository.rb b/app/models/site/repository.rb
index e77aded9..eeca72c4 100644
--- a/app/models/site/repository.rb
+++ b/app/models/site/repository.rb
@@ -260,5 +260,10 @@ class Site
 
       r&.success?
     end
+
+    def lfs_cleanup
+      git_sh("git", "lfs", "prune")
+      git_sh("git", "lfs", "dedup")
+    end
   end
 end
diff --git a/app/models/social_inbox.rb b/app/models/social_inbox.rb
index 21b0ca45..2f5e7eca 100644
--- a/app/models/social_inbox.rb
+++ b/app/models/social_inbox.rb
@@ -67,9 +67,12 @@ class SocialInbox
     end
   end
 
+  # El hostname puede estar en varios lados...
+  #
+  # @return [String]
   def hostname
     @hostname ||=
-      site.config.dig('activity_pub', 'hostname') || site.hostname
+      site.config.dig('activity_pub', 'hostname') || site.config['hostname'] || site.hostname
   end
 
   # Genera una URI dentro de este sitio
diff --git a/app/services/cleanup_service.rb b/app/services/cleanup_service.rb
index 28f6f860..e53fbcb4 100644
--- a/app/services/cleanup_service.rb
+++ b/app/services/cleanup_service.rb
@@ -31,7 +31,7 @@ class CleanupService
       site.deploys.find_each(&:cleanup!)
 
       site.repository.gc
-      lfs_cleanup
+      site.repository.lfs_cleanup
       site.touch
     end
   end
@@ -46,14 +46,8 @@ class CleanupService
       Rails.logger.info "Limpiando repositorio git de #{site.name}"
 
       site.repository.gc
-      lfs_cleanup
+      site.repository.lfs_cleanup
       site.touch
     end
   end
-
-  private 
-  def lfs_cleanup
-    site.repository.git_sh("git", "lfs", "prune")
-    site.repository.git_sh("git", "lfs", "dedup")
-  end
 end
diff --git a/app/services/site_service.rb b/app/services/site_service.rb
index 13a4322e..8e30772a 100644
--- a/app/services/site_service.rb
+++ b/app/services/site_service.rb
@@ -13,7 +13,7 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do
   def create
     self.site = Site.new params
 
-    add_role temporal: false, rol: 'usuarie'
+    role = site.roles.build(usuarie: usuarie, temporal: false, rol: 'usuarie')
     site.deploys.build type: 'DeployLocal'
     # Los sitios de testing no se sincronizan
     sync_nodes unless site.name.end_with? '.testing'
@@ -26,6 +26,8 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do
       # que no haya estados intermedios.
       site.locales = [usuarie.lang]
 
+      add_role_to_deploys! role
+
       site.save &&
         site.config.write &&
         commit_config(action: :create) &&
@@ -43,7 +45,10 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do
   # Actualiza el sitio y guarda los cambios en la configuración
   def update
     I18n.with_locale(usuarie&.lang&.to_sym || I18n.default_locale) do
-      site.update(params) &&
+      site.assign_attributes(params)
+      add_role_to_deploys!
+
+      site.save &&
         site.config.write &&
         commit_config(action: :update) &&
         site.reset.nil? &&
@@ -113,11 +118,6 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do
     GitPushJob.perform_later(site)
   end
 
-  def add_role(temporal: true, rol: 'invitade')
-    site.roles << Rol.new(site: site, usuarie: usuarie,
-                          temporal: temporal, rol: rol)
-  end
-
   # Crea la licencia del sitio para cada locale disponible en el sitio
   #
   # @return [Boolean]
@@ -236,6 +236,17 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do
 
   private
 
+  # Asignar un rol a cada deploy si no lo tenía ya
+  def add_role_to_deploys!(role = current_role)
+    site.deploys.each do |deploy|
+      deploy.rol ||= role
+    end
+  end
+
+  def current_role
+    @current_role ||= usuarie.rol_for_site(site)
+  end
+
   def with_all_locales(&block)
     site.locales.map do |locale|
       next unless I18n.available_locales.include? locale