diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2746ab10..3201b909 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,7 +3,7 @@
 # Forma de ingreso a Sutty
 class ApplicationController < ActionController::Base
   include ExceptionHandler
-  include Pundit
+  include Pundit::Authorization
 
   protect_from_forgery with: :null_session, prepend: true
 
diff --git a/app/models/concerns/tienda.rb b/app/models/concerns/tienda.rb
index cd09358e..86174c9a 100644
--- a/app/models/concerns/tienda.rb
+++ b/app/models/concerns/tienda.rb
@@ -5,7 +5,7 @@ module Tienda
   extend ActiveSupport::Concern
 
   included do
-    encrypts :tienda_api_key
+    has_encrypted :tienda_api_key
 
     def tienda?
       tienda_api_key.present? && tienda_url.present?
diff --git a/app/models/site.rb b/app/models/site.rb
index dd250e3d..a9cb3652 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -17,7 +17,7 @@ class Site < ApplicationRecord
   # tiene acceso pero los datos se guardan cifrados en el sitio.  Esto
   # protege información privada en repositorios públicos, pero no la
   # protege de acceso al panel de Sutty!
-  encrypts :private_key
+  has_encrypted :private_key
 
   validates :name, uniqueness: true, hostname: {
     allow_root_label: true
diff --git a/app/models/site/api.rb b/app/models/site/api.rb
index 73f8e710..6c6f0ece 100644
--- a/app/models/site/api.rb
+++ b/app/models/site/api.rb
@@ -5,7 +5,7 @@ class Site
     extend ActiveSupport::Concern
 
     included do
-      encrypts :api_key
+      has_encrypted :api_key
       before_save :add_api_key_if_missing!
 
       # Genera mensajes secretos que podemos usar para la API de cada
diff --git a/app/models/site/social_distributed_press.rb b/app/models/site/social_distributed_press.rb
index c3abe06e..7ebdcb36 100644
--- a/app/models/site/social_distributed_press.rb
+++ b/app/models/site/social_distributed_press.rb
@@ -8,7 +8,7 @@ class Site
     extend ActiveSupport::Concern
 
     included do
-      encrypts :private_key_pem
+      has_encrypted :private_key_pem
 
       has_many :activity_pubs