diff --git a/.ruby-version b/.ruby-version
index a603bb50..818bd47a 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.5
+3.0.6
diff --git a/Gemfile b/Gemfile
index 6ee9db34..8402e29d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-DECIDIM_VERSION = "0.26"
+DECIDIM_VERSION = "0.27"
 DECIDIM_BRANCH = "release/#{DECIDIM_VERSION}-stable"
 
 ruby RUBY_VERSION
@@ -15,9 +15,9 @@ gem "decidim", "~> #{DECIDIM_VERSION}.0"
 
 # External Decidim gems
 gem "decidim-cache_cleaner"
-gem "decidim-decidim_awesome"
+gem "decidim-decidim_awesome", "~> 0.9.1"
 gem "decidim-spam_detection"
-gem "decidim-term_customizer", git: "https://github.com/armandfardeau/decidim-module-term_customizer.git", branch: "fix/precompile-on-docker-0.26"
+gem "decidim-term_customizer", git: "https://github.com/opensourcepolitics/decidim-module-term_customizer.git", branch: "fix/multi-threading-compliant"
 
 # Omniauth gems
 gem "omniauth-saml"
@@ -35,8 +35,9 @@ gem "puma", ">= 5.5.1"
 
 gem "letter_opener_web", "~> 1.3"
 gem "rack-attack", "~> 6.6"
-gem "ruby-progressbar", "~> 1.11"
-gem "sprockets", "~> 3.7"
+gem "sidekiq", "~> 6.0"
+gem "sidekiq_alive", "~> 2.2"
+gem "sidekiq-scheduler", "~> 5.0"
 gem "sys-filesystem"
 gem "uglifier", "~> 4.1"
 
@@ -64,7 +65,4 @@ group :production do
   gem "sentry-rails"
   gem "sentry-ruby"
   gem "sentry-sidekiq"
-  gem "sidekiq", "~> 6.0"
-  gem "sidekiq_alive", "~> 2.2"
-  gem "sidekiq-scheduler", "~> 5.0"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 87bc1548..40e59479 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,11 @@
 GIT
-  remote: https://github.com/armandfardeau/decidim-module-term_customizer.git
-  revision: 63170f69b51bb7e7f60f20856e944ae1357f4dc7
-  branch: fix/precompile-on-docker-0.26
+  remote: https://github.com/opensourcepolitics/decidim-module-term_customizer.git
+  revision: 8a6b73e58fbdd7f38daf983a310d37c510ec9baf
+  branch: fix/multi-threading-compliant
   specs:
-    decidim-term_customizer (0.26.0)
-      decidim-admin (~> 0.26.0)
-      decidim-core (~> 0.26.0)
+    decidim-term_customizer (0.27.0)
+      decidim-admin (~> 0.27.0)
+      decidim-core (~> 0.27.0)
 
 GIT
   remote: https://github.com/sgruhier/foundation_rails_helper.git
@@ -20,38 +20,40 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.6)
-      actionpack (= 6.0.6)
+    actioncable (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.6)
-      actionpack (= 6.0.6)
-      activejob (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
+    actionmailbox (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       mail (>= 2.7.1)
-    actionmailer (6.0.6)
-      actionpack (= 6.0.6)
-      actionview (= 6.0.6)
-      activejob (= 6.0.6)
+    actionmailer (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      actionview (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.6)
-      actionview (= 6.0.6)
-      activesupport (= 6.0.6)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.7.7)
+      actionview (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.6)
-      actionpack (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
+    actiontext (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       nokogiri (>= 1.8.5)
-    actionview (6.0.6)
-      activesupport (= 6.0.6)
+    actionview (6.1.7.7)
+      activesupport (= 6.1.7.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -59,50 +61,52 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    activejob (6.0.6)
-      activesupport (= 6.0.6)
+    activejob (6.1.7.7)
+      activesupport (= 6.1.7.7)
       globalid (>= 0.3.6)
-    activejob-uniqueness (0.2.4)
-      activejob (>= 4.2, < 7.1)
-      redlock (>= 1.2, < 2)
-    activemodel (6.0.6)
-      activesupport (= 6.0.6)
-    activerecord (6.0.6)
-      activemodel (= 6.0.6)
-      activesupport (= 6.0.6)
-    activestorage (6.0.6)
-      actionpack (= 6.0.6)
-      activejob (= 6.0.6)
-      activerecord (= 6.0.6)
+    activejob-uniqueness (0.3.1)
+      activejob (>= 4.2, < 7.2)
+      redlock (>= 2.0, < 3)
+    activemodel (6.1.7.7)
+      activesupport (= 6.1.7.7)
+    activerecord (6.1.7.7)
+      activemodel (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
+    activestorage (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       marcel (~> 1.0)
-    activesupport (6.0.6)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     acts_as_list (0.9.19)
       activerecord (>= 3.0)
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.791.0)
-    aws-sdk-core (3.178.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.894.0)
+    aws-sdk-core (3.191.3)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.131.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    axe-core-api (4.4.1)
+    axe-core-api (4.8.2)
       dumb_delegator
       virtus
     axe-core-rspec (4.1.0)
@@ -113,8 +117,9 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    base64 (0.2.0)
     batch-loader (1.5.0)
-    bcrypt (3.1.18)
+    bcrypt (3.1.20)
     better_html (1.0.16)
       actionview (>= 4.0)
       activesupport (>= 4.0)
@@ -123,23 +128,24 @@ GEM
       html_tokenizer (~> 0.0.6)
       parser (>= 2.4)
       smart_properties
+    bigdecimal (3.1.6)
     bindex (0.8.1)
-    bootsnap (1.13.0)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
-    brakeman (5.3.1)
+    brakeman (5.4.1)
     browser (2.7.1)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.37.1)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (2.2.2)
+    carrierwave (2.2.6)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
       addressable (~> 2.6)
@@ -159,9 +165,9 @@ GEM
       actionpack (>= 5.0)
       cells (>= 4.1.6, < 5.0.0)
     charlock_holmes (0.7.7)
-    chef-utils (17.10.0)
+    chef-utils (18.4.2)
       concurrent-ruby
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     climate_control (1.2.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -172,69 +178,72 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.3.0)
-    crack (0.4.5)
+    commonmarker (0.23.10)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.12.0)
+    css_parser (1.17.1)
       addressable
-    dalli (3.2.2)
-    date_validator (0.9.0)
-      activemodel
-      activesupport
+    dalli (3.2.8)
+    date (3.3.4)
+    date_validator (0.12.0)
+      activemodel (>= 3)
+      activesupport (>= 3)
     db-query-matchers (0.10.0)
       activesupport (>= 4.0, < 7)
       rspec (~> 3.0)
-    decidim (0.26.7)
-      decidim-accountability (= 0.26.7)
-      decidim-admin (= 0.26.7)
-      decidim-api (= 0.26.7)
-      decidim-assemblies (= 0.26.7)
-      decidim-blogs (= 0.26.7)
-      decidim-budgets (= 0.26.7)
-      decidim-comments (= 0.26.7)
-      decidim-core (= 0.26.7)
-      decidim-debates (= 0.26.7)
-      decidim-forms (= 0.26.7)
-      decidim-generators (= 0.26.7)
-      decidim-meetings (= 0.26.7)
-      decidim-pages (= 0.26.7)
-      decidim-participatory_processes (= 0.26.7)
-      decidim-proposals (= 0.26.7)
-      decidim-sortitions (= 0.26.7)
-      decidim-surveys (= 0.26.7)
-      decidim-system (= 0.26.7)
-      decidim-templates (= 0.26.7)
-      decidim-verifications (= 0.26.7)
-    decidim-accountability (0.26.7)
-      decidim-comments (= 0.26.7)
-      decidim-core (= 0.26.7)
-    decidim-admin (0.26.7)
+    decidim (0.27.5)
+      decidim-accountability (= 0.27.5)
+      decidim-admin (= 0.27.5)
+      decidim-api (= 0.27.5)
+      decidim-assemblies (= 0.27.5)
+      decidim-blogs (= 0.27.5)
+      decidim-budgets (= 0.27.5)
+      decidim-comments (= 0.27.5)
+      decidim-core (= 0.27.5)
+      decidim-debates (= 0.27.5)
+      decidim-forms (= 0.27.5)
+      decidim-generators (= 0.27.5)
+      decidim-meetings (= 0.27.5)
+      decidim-pages (= 0.27.5)
+      decidim-participatory_processes (= 0.27.5)
+      decidim-proposals (= 0.27.5)
+      decidim-sortitions (= 0.27.5)
+      decidim-surveys (= 0.27.5)
+      decidim-system (= 0.27.5)
+      decidim-templates (= 0.27.5)
+      decidim-verifications (= 0.27.5)
+    decidim-accountability (0.27.5)
+      decidim-comments (= 0.27.5)
+      decidim-core (= 0.27.5)
+    decidim-admin (0.27.5)
       active_link_to (~> 1.0)
-      decidim-core (= 0.26.7)
+      decidim-core (= 0.27.5)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
-      devise_invitable (~> 2.0)
-    decidim-api (0.26.7)
+      devise_invitable (~> 2.0, >= 2.0.9)
+    decidim-api (0.27.5)
       graphql (~> 1.12, < 1.13)
+      graphql-docs (~> 2.1.0)
       rack-cors (~> 1.0)
-      redcarpet (~> 3.5, >= 3.5.1)
-    decidim-assemblies (0.26.7)
-      decidim-core (= 0.26.7)
-    decidim-blogs (0.26.7)
-      decidim-admin (= 0.26.7)
-      decidim-comments (= 0.26.7)
-      decidim-core (= 0.26.7)
-    decidim-budgets (0.26.7)
-      decidim-comments (= 0.26.7)
-      decidim-core (= 0.26.7)
+    decidim-assemblies (0.27.5)
+      decidim-core (= 0.27.5)
+    decidim-blogs (0.27.5)
+      decidim-admin (= 0.27.5)
+      decidim-comments (= 0.27.5)
+      decidim-core (= 0.27.5)
+    decidim-budgets (0.27.5)
+      decidim-comments (= 0.27.5)
+      decidim-core (= 0.27.5)
     decidim-cache_cleaner (1.0.4)
       decidim-core (~> 0.26)
-    decidim-comments (0.26.7)
-      decidim-core (= 0.26.7)
+    decidim-comments (0.27.5)
+      decidim-core (= 0.27.5)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-core (0.26.7)
+    decidim-core (0.27.5)
       active_link_to (~> 1.0)
       acts_as_list (~> 0.9)
       batch-loader (~> 1.2)
@@ -243,21 +252,21 @@ GEM
       cells-erb (~> 0.1.0)
       cells-rails (~> 0.1.3)
       charlock_holmes (~> 0.7)
-      date_validator (~> 0.9.0)
-      decidim-api (= 0.26.7)
+      date_validator (~> 0.12.0)
+      decidim-api (= 0.27.5)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       diffy (~> 3.3)
       doorkeeper (~> 5.1)
       doorkeeper-i18n (~> 4.0)
-      file_validators (~> 2.1)
+      file_validators (~> 3.0)
       fog-local (~> 0.6)
-      foundation_rails_helper
-      geocoder (~> 1.7.5)
+      foundation_rails_helper (~> 4.0)
+      geocoder (~> 1.8)
       hashdiff (>= 0.4.0, < 2.0.0)
       invisible_captcha (~> 0.12)
       kaminari (~> 1.2, >= 1.2.1)
-      loofah (~> 2.3.1)
+      loofah (~> 2.19.0)
       mime-types (>= 1.16, < 4.0)
       mini_magick (~> 4.9)
       mustache (~> 1.1.0)
@@ -272,119 +281,118 @@ GEM
       premailer-rails (~> 1.10)
       rack (~> 2.2, >= 2.2.3)
       rack-attack (~> 6.0)
-      rails (~> 6.0.4)
+      rails (~> 6.1.0)
       rails-i18n (~> 6.0)
       ransack (~> 2.4.1)
-      rectify (~> 0.13.0)
       redis (~> 4.1)
       request_store (~> 1.5.0)
       rubyXL (~> 3.4)
       rubyzip (~> 2.0)
-      searchlight (~> 4.1)
       seven_zip_ruby (~> 1.3)
       social-share-button (~> 1.2, >= 1.2.1)
       valid_email2 (~> 2.1)
       webpacker (= 6.0.0.rc.5)
+      webpush (~> 1.1)
       wisper (~> 2.0)
-    decidim-debates (0.26.7)
-      decidim-comments (= 0.26.7)
-      decidim-core (= 0.26.7)
-    decidim-decidim_awesome (0.8.3)
-      decidim-admin (>= 0.25.0, < 0.27)
-      decidim-core (>= 0.25.0, < 0.27)
+    decidim-debates (0.27.5)
+      decidim-comments (= 0.27.5)
+      decidim-core (= 0.27.5)
+    decidim-decidim_awesome (0.9.3)
+      decidim-admin (>= 0.26.0, < 0.28)
+      decidim-core (>= 0.26.0, < 0.28)
       sassc (~> 2.3)
-    decidim-dev (0.26.7)
+    decidim-dev (0.27.5)
       axe-core-rspec (~> 4.1.0)
       byebug (~> 11.0)
       capybara (~> 3.24)
       db-query-matchers (~> 0.10.0)
-      decidim (= 0.26.7)
+      decidim (= 0.27.5)
       erb_lint (~> 0.0.35)
       factory_bot_rails (~> 4.8)
       i18n-tasks (~> 0.9.18)
       mdl (~> 0.5)
-      nokogiri (~> 1.12)
+      nokogiri (~> 1.13)
+      parallel_tests (~> 3.7)
       puma (~> 5.0)
       rails-controller-testing (~> 1.0)
-      rspec-cells (~> 0.3.4)
+      rspec-cells (~> 0.3.7)
       rspec-html-matchers (~> 0.9.1)
       rspec-rails (~> 4.0)
       rspec-retry (~> 0.6.2)
       rspec_junit_formatter (~> 0.3.0)
-      rubocop (~> 0.92.0)
-      rubocop-rails (~> 2.8)
-      rubocop-rspec (= 1.43.2)
-      selenium-webdriver (~> 3.142)
-      simplecov (~> 0.19.0)
-      simplecov-cobertura (~> 1.3.1)
-      system_test_html_screenshots (~> 0.2)
+      rubocop (~> 1.28.0)
+      rubocop-rails (~> 2.14)
+      rubocop-rspec (~> 2.10)
+      selenium-webdriver (~> 4.1.0)
+      simplecov (~> 0.21.0)
+      simplecov-cobertura (~> 2.1.0)
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.6)
       wisper-rspec (~> 1.0)
-    decidim-forms (0.26.7)
-      decidim-core (= 0.26.7)
+    decidim-forms (0.27.5)
+      decidim-core (= 0.27.5)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-generators (0.26.7)
-      decidim-core (= 0.26.7)
-    decidim-meetings (0.26.7)
-      decidim-core (= 0.26.7)
-      decidim-forms (= 0.26.7)
+    decidim-generators (0.27.5)
+      decidim-core (= 0.27.5)
+    decidim-meetings (0.27.5)
+      decidim-core (= 0.27.5)
+      decidim-forms (= 0.27.5)
       icalendar (~> 2.5)
-    decidim-pages (0.26.7)
-      decidim-core (= 0.26.7)
-    decidim-participatory_processes (0.26.7)
-      decidim-core (= 0.26.7)
-    decidim-proposals (0.26.7)
-      decidim-comments (= 0.26.7)
-      decidim-core (= 0.26.7)
-      doc2text (~> 0.4.4)
+    decidim-pages (0.27.5)
+      decidim-core (= 0.27.5)
+    decidim-participatory_processes (0.27.5)
+      decidim-core (= 0.27.5)
+    decidim-proposals (0.27.5)
+      decidim-comments (= 0.27.5)
+      decidim-core (= 0.27.5)
+      doc2text (~> 0.4.5)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.26.7)
-      decidim-admin (= 0.26.7)
-      decidim-comments (= 0.26.7)
-      decidim-core (= 0.26.7)
-      decidim-proposals (= 0.26.7)
-    decidim-spam_detection (3.1.0)
-      decidim-core (~> 0.26.0)
-    decidim-surveys (0.26.7)
-      decidim-core (= 0.26.7)
-      decidim-forms (= 0.26.7)
-      decidim-templates (= 0.26.7)
-    decidim-system (0.26.7)
+    decidim-sortitions (0.27.5)
+      decidim-admin (= 0.27.5)
+      decidim-comments (= 0.27.5)
+      decidim-core (= 0.27.5)
+      decidim-proposals (= 0.27.5)
+    decidim-spam_detection (4.0.0)
+      decidim-core (~> 0.27.0)
+    decidim-surveys (0.27.5)
+      decidim-core (= 0.27.5)
+      decidim-forms (= 0.27.5)
+      decidim-templates (= 0.27.5)
+    decidim-system (0.27.5)
       active_link_to (~> 1.0)
-      decidim-core (= 0.26.7)
+      decidim-core (= 0.27.5)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
-      devise_invitable (~> 2.0)
-    decidim-templates (0.26.7)
-      decidim-core (= 0.26.7)
-      decidim-forms (= 0.26.7)
-    decidim-verifications (0.26.7)
-      decidim-core (= 0.26.7)
+      devise_invitable (~> 2.0, >= 2.0.9)
+    decidim-templates (0.27.5)
+      decidim-core (= 0.27.5)
+      decidim-forms (= 0.27.5)
+    decidim-verifications (0.27.5)
+      decidim-core (= 0.27.5)
     declarative-builder (0.1.0)
       declarative-option (< 0.2.0)
     declarative-option (0.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.8.1)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-i18n (1.10.2)
-      devise (>= 4.8.0)
-    devise_invitable (2.0.6)
+    devise-i18n (1.12.0)
+      devise (>= 4.9.0)
+    devise_invitable (2.0.9)
       actionmailer (>= 5.0)
       devise (>= 4.6)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     diffy (3.4.2)
-    doc2text (0.4.5)
-      nokogiri (>= 1.13.2, < 1.14.0)
+    doc2text (0.4.7)
+      nokogiri (>= 1.13.2, < 1.17.0)
       rubyzip (~> 2.3.0)
     docile (1.4.0)
-    doorkeeper (5.6.0)
+    doorkeeper (5.6.9)
       railties (>= 5)
     doorkeeper-i18n (4.0.1)
     dotenv (2.8.1)
@@ -392,7 +400,6 @@ GEM
       dotenv (= 2.8.1)
       railties (>= 3.2)
     dumb_delegator (1.0.0)
-    equalizer (0.0.11)
     erb_lint (0.0.37)
       activesupport
       better_html (~> 1.0.7)
@@ -403,11 +410,14 @@ GEM
       smart_properties
     erbse (0.1.4)
       temple
-    erubi (1.11.0)
+    erubi (1.12.0)
+    escape_utils (1.3.0)
     et-orbi (1.2.7)
       tzinfo
-    excon (0.92.5)
-    execjs (2.8.1)
+    excon (0.110.0)
+    execjs (2.9.1)
+    extended-markdown-filter (0.7.0)
+      html-pipeline (~> 2.9)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.11.1)
@@ -415,19 +425,19 @@ GEM
       railties (>= 3.0.0)
     faker (2.23.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.5.2)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
-    ffi (1.15.5)
-    file_validators (2.3.0)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    ffi (1.16.3)
+    file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
-    fog-aws (3.15.0)
+    fog-aws (3.21.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
-    fog-core (2.3.0)
+    fog-core (2.4.0)
       builder
       excon (~> 0.71)
       formatador (>= 0.2, < 2.0)
@@ -441,21 +451,35 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (1.1.0)
-    fugit (1.8.1)
+    fugit (1.9.0)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
-    geocoder (1.7.5)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
+    gemoji (3.0.1)
+    geocoder (1.8.2)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     graphql (1.12.24)
-    hashdiff (1.0.1)
+    graphql-docs (2.1.0)
+      commonmarker (~> 0.16)
+      escape_utils (~> 1.2)
+      extended-markdown-filter (~> 0.4)
+      gemoji (~> 3.0)
+      graphql (~> 1.12)
+      html-pipeline (~> 2.9)
+      sass (~> 3.4)
+    gserver (0.0.1)
+    hashdiff (1.1.0)
     hashie (5.0.0)
     health_check (3.1.0)
       railties (>= 5.0)
-    highline (2.0.3)
+    highline (3.0.1)
+    hkdf (0.3.0)
+    html-pipeline (2.14.3)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
-    i18n (1.12.0)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.37)
       activesupport (>= 4.0.2)
@@ -467,7 +491,7 @@ GEM
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
-    icalendar (2.8.0)
+    icalendar (2.10.1)
       ice_cube (~> 0.16)
     ice_cube (0.16.4)
     ice_nine (0.11.2)
@@ -477,8 +501,9 @@ GEM
     invisible_captcha (0.13.0)
       rails (>= 3.2.0)
     jmespath (1.6.2)
-    json (2.6.2)
-    jwt (2.5.0)
+    json (2.7.1)
+    jwt (2.8.1)
+      base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -495,55 +520,67 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    launchy (2.5.0)
-      addressable (~> 2.7)
-    letter_opener (1.8.1)
+    launchy (2.5.2)
+      addressable (~> 2.8)
+    letter_opener (1.9.0)
       launchy (>= 2.2, < 3)
     letter_opener_web (1.4.1)
       actionmailer (>= 3.2)
       letter_opener (~> 1.0)
       railties (>= 3.2)
-    listen (3.7.1)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lograge (0.12.0)
+    lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.3.1)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.2)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
     matrix (0.4.2)
-    mdl (0.11.0)
+    mdl (0.13.0)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
       mixlib-cli (~> 2.1, >= 2.1.1)
       mixlib-config (>= 2.2.1, < 4)
       mixlib-shellout
     method_source (1.0.0)
-    mime-types (3.4.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    mini_magick (4.11.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mime-types-data (3.2024.0305)
+    mini_magick (4.12.0)
+    mini_mime (1.1.5)
+    minitest (5.22.3)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
     mixlib-shellout (3.2.7)
       chef-utils
-    msgpack (1.5.6)
+    msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mustache (1.1.1)
-    nio4r (2.5.8)
-    nokogiri (1.13.4)
-      mini_portile2 (~> 2.8.0)
+    net-http (0.4.1)
+      uri
+    net-imap (0.4.10)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.1)
+    nokogiri (1.13.4-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.4-x86_64-darwin)
       racc (~> 1.4)
@@ -562,17 +599,17 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    omniauth (2.1.0)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
     omniauth-facebook (5.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (1.1.1)
+    omniauth-google-oauth2 (1.1.2)
       jwt (>= 2.0)
-      oauth2 (~> 2.0.6)
+      oauth2 (~> 2.0)
       omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.8.0)
+      omniauth-oauth2 (~> 1.8)
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
@@ -592,73 +629,77 @@ GEM
     paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
-    parallel (1.22.1)
-    parallel_tests (3.7.3)
+    parallel (1.24.0)
+    parallel_tests (3.13.0)
       parallel
-    parser (3.1.2.1)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
+      racc
     pg (1.1.4)
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
-    premailer (1.17.0)
+    premailer (1.23.0)
       addressable
       css_parser (>= 1.12.0)
       htmlentities (>= 4.0.0)
-    premailer-rails (1.11.1)
+    premailer-rails (1.12.0)
       actionmailer (>= 3)
+      net-smtp
       premailer (~> 1.7, >= 1.7.9)
-    public_suffix (5.0.0)
-    puma (5.6.5)
+    public_suffix (5.0.5)
+    puma (5.6.8)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-attack (6.6.1)
-      rack (>= 1.0, < 3)
+    racc (1.7.3)
+    rack (2.2.9)
+    rack-attack (6.7.0)
+      rack (>= 1.0, < 4)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-protection (2.2.2)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
+    rack-proxy (0.7.7)
       rack
-    rack-proxy (0.7.4)
-      rack
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.0.6)
-      actioncable (= 6.0.6)
-      actionmailbox (= 6.0.6)
-      actionmailer (= 6.0.6)
-      actionpack (= 6.0.6)
-      actiontext (= 6.0.6)
-      actionview (= 6.0.6)
-      activejob (= 6.0.6)
-      activemodel (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
-      bundler (>= 1.3.0)
-      railties (= 6.0.6)
+    rails (6.1.7.7)
+      actioncable (= 6.1.7.7)
+      actionmailbox (= 6.1.7.7)
+      actionmailer (= 6.1.7.7)
+      actionpack (= 6.1.7.7)
+      actiontext (= 6.1.7.7)
+      actionview (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activemodel (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
+      bundler (>= 1.15.0)
+      railties (= 6.1.7.7)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.0.6)
-      actionpack (= 6.0.6)
-      activesupport (= 6.0.6)
+    railties (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.2.1)
     ransack (2.4.2)
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
@@ -666,41 +707,37 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rectify (0.13.0)
-      activemodel (>= 4.1.0)
-      activerecord (>= 4.1.0)
-      activesupport (>= 4.1.0)
-      virtus (~> 1.0.5)
-      wisper (>= 1.6.1)
-    redcarpet (3.5.1)
-    redis (4.8.0)
-    redlock (1.3.0)
-      redis (>= 3.0.0, < 6.0)
-    regexp_parser (2.5.0)
+    redcarpet (3.6.0)
+    redis (4.8.1)
+    redis-client (0.20.0)
+      connection_pool
+    redlock (2.0.6)
+      redis-client (>= 0.14.1, < 1.0.0)
+    regexp_parser (2.9.0)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-cells (0.3.7)
+    responders (3.1.1)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
+    rexml (3.2.6)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-cells (0.3.9)
       cells (>= 4.0.0, < 6.0.0)
-      rspec-rails (< 6.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+      rspec-rails (>= 3.0.0, < 6.2.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.13.0)
     rspec-html-matchers (0.9.4)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.13.0)
     rspec-rails (4.1.2)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
@@ -711,123 +748,128 @@ GEM
       rspec-support (~> 3.10)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.11.1)
+    rspec-support (3.13.0)
     rspec_junit_formatter (0.3.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.92.0)
+    rubocop (1.28.2)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
     rubocop-faker (1.1.0)
       faker (>= 2.12.0)
       rubocop (>= 0.82.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.15.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rspec (1.43.2)
-      rubocop (~> 0.87)
-    ruby-progressbar (1.11.0)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.13.0)
     ruby-saml (1.14.0)
       nokogiri (>= 1.10.5)
       rexml
-    ruby-vips (2.1.4)
+    ruby-vips (2.2.1)
       ffi (~> 1.12)
-    ruby2_keywords (0.0.5)
-    rubyXL (3.4.25)
+    rubyXL (3.4.26)
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
     ruby_http_client (3.5.5)
     rubyzip (2.3.2)
     rufus-scheduler (3.9.1)
       fugit (~> 1.1, >= 1.1.6)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sassc (2.4.0)
       ffi (~> 1.9)
-    searchlight (4.1.0)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
     semantic_range (3.0.0)
-    sendgrid-ruby (6.6.2)
+    sendgrid-ruby (6.7.0)
       ruby_http_client (~> 3.4)
-    sentry-rails (5.4.2)
+    sentry-rails (5.16.1)
       railties (>= 5.0)
-      sentry-ruby (~> 5.4.2)
-    sentry-ruby (5.4.2)
+      sentry-ruby (~> 5.16.1)
+    sentry-ruby (5.16.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.4.2)
-      sentry-ruby (~> 5.4.2)
+    sentry-sidekiq (5.16.1)
+      sentry-ruby (~> 5.16.1)
       sidekiq (>= 3.0)
     seven_zip_ruby (1.3.0)
-    sidekiq (6.5.7)
-      connection_pool (>= 2.2.5)
+    sidekiq (6.5.12)
+      connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
     sidekiq-scheduler (5.0.3)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
       tilt (>= 1.4.0)
-    sidekiq_alive (2.2.3)
-      rack (< 3)
+    sidekiq_alive (2.4.0)
+      gserver (~> 0.0.1)
       sidekiq (>= 5, < 8)
-      webrick (>= 1, < 2)
-    simplecov (0.19.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-cobertura (1.3.1)
-      simplecov (~> 0.8)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (2.1.0)
+      rexml
+      simplecov (~> 0.19)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    snaky_hash (2.0.0)
+    snaky_hash (2.0.1)
       hashie
-      version_gem (~> 1.1)
+      version_gem (~> 1.1, >= 1.1.1)
     social-share-button (1.2.4)
       coffee-rails
     spring (2.1.1)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (3.7.2)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    ssrf_filter (1.1.1)
-    sys-filesystem (1.4.3)
+    ssrf_filter (1.1.2)
+    sys-filesystem (1.4.4)
       ffi (~> 1.1)
-    system_test_html_screenshots (0.2.0)
-      actionpack (>= 5.2, < 6.1.a)
-    temple (0.8.2)
+    temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.1)
+    thor (1.3.1)
     thread_safe (0.3.6)
-    tilt (2.0.11)
+    tilt (2.3.0)
+    timeout (0.4.1)
     tomlrb (2.0.3)
-    tzinfo (1.2.10)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.5.0)
+    uri (0.13.0)
     valid_email2 (2.3.1)
       activemodel (>= 3.2)
       mail (~> 2.5)
-    version_gem (1.1.1)
-    virtus (1.0.5)
+    version_gem (1.1.4)
+    virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
     w3c_rspec_validators (0.3.0)
       rails
       rspec
@@ -843,7 +885,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.18.1)
+    webmock (3.22.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -852,22 +894,26 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    webrick (1.8.1)
-    websocket-driver (0.7.5)
+    webpush (1.1.0)
+      hkdf (~> 0.2)
+      jwt (~> 2.0)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wicked_pdf (2.6.3)
       activesupport
     wisper (2.0.1)
     wisper-rspec (1.1.0)
-    wkhtmltopdf-binary (0.12.6.5)
+    wkhtmltopdf-binary (0.12.6.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.13)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
+  x86_64-darwin-20
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -878,10 +924,10 @@ DEPENDENCIES
   byebug (~> 11.0)
   climate_control (~> 1.2)
   dalli
-  decidim (~> 0.26.0)
+  decidim (~> 0.27.0)
   decidim-cache_cleaner
-  decidim-decidim_awesome
-  decidim-dev (~> 0.26.0)
+  decidim-decidim_awesome (~> 0.9.1)
+  decidim-dev (~> 0.27.0)
   decidim-spam_detection
   decidim-term_customizer!
   dotenv-rails
@@ -899,7 +945,6 @@ DEPENDENCIES
   puma (>= 5.5.1)
   rack-attack (~> 6.6)
   rubocop-faker
-  ruby-progressbar (~> 1.11)
   sendgrid-ruby
   sentry-rails
   sentry-ruby
@@ -909,13 +954,12 @@ DEPENDENCIES
   sidekiq_alive (~> 2.2)
   spring (~> 2.0)
   spring-watcher-listen (~> 2.0)
-  sprockets (~> 3.7)
   sys-filesystem
   uglifier (~> 4.1)
   web-console (= 4.0.4)
 
 RUBY VERSION
-   ruby 2.7.5p203
+   ruby 3.0.6p216
 
 BUNDLED WITH
-   2.3.13
+   2.4.9
diff --git a/app/controllers/decidim/devise/custom_omniauth_registrations_controller.rb b/app/controllers/decidim/devise/custom_omniauth_registrations_controller.rb
index d72cee12..3ab123ff 100644
--- a/app/controllers/decidim/devise/custom_omniauth_registrations_controller.rb
+++ b/app/controllers/decidim/devise/custom_omniauth_registrations_controller.rb
@@ -9,6 +9,7 @@ class CustomOmniauthRegistrationsController < ::Decidim::Devise::OmniauthRegistr
       # rubocop:enable Rails/LexicallyScopedActionFilter
 
       include Decidim::AuthentificationHelper
+      include Decidim::DeviseAuthenticationMethods
 
       def create
         form_params = user_params_from_oauth_hash || params[:user]
@@ -47,16 +48,6 @@ def create
           end
         end
       end
-
-      def after_sign_in_path_for(user)
-        if user.present? && user.blocked?
-          check_user_block_status(user)
-        elsif !pending_redirect?(user) && can_access_admin?(user)
-          "/admin"
-        else
-          super
-        end
-      end
     end
   end
 end
diff --git a/app/services/decidim/repair_nickname_service.rb b/app/services/decidim/repair_nickname_service.rb
index 3d447fd8..23a40490 100644
--- a/app/services/decidim/repair_nickname_service.rb
+++ b/app/services/decidim/repair_nickname_service.rb
@@ -52,10 +52,10 @@ def valid_nickname_for(user)
     #   Returns the corresponding char
     # Else returns nil
     def ascii_to_valid_char(id)
-      letters = ("A".."Z").to_a.join("").codepoints
-      letters += ("a".."z").to_a.join("").codepoints
-      digits = ("0".."9").to_a.join("").codepoints
-      special_chars = %w(- _).join("").codepoints
+      letters = ("A".."Z").to_a.join.codepoints
+      letters += ("a".."z").to_a.join.codepoints
+      digits = ("0".."9").to_a.join.codepoints
+      special_chars = %w(- _).join.codepoints
 
       valid_ascii_code = letters + digits + special_chars
 
diff --git a/app/views/decidim/account/show.html.erb b/app/views/decidim/account/show.html.erb
new file mode 100644
index 00000000..7694e1e4
--- /dev/null
+++ b/app/views/decidim/account/show.html.erb
@@ -0,0 +1,69 @@
+<%= alert_box("", "account-notification hide", true) %>
+<% add_decidim_page_title(t("profile", scope: "layouts.decidim.user_menu")) %>
+<% content_for(:subtitle) { t("profile", scope: "layouts.decidim.user_menu") } %>
+
+<div class="row">
+  <%= decidim_form_for(@account, url: account_path, method: :put, html: { autocomplete: "on" }) do |f| %>
+    <div class="columns large-4">
+      <%= f.upload :avatar %>
+    </div>
+
+    <div class="columns large-8 end">
+      <% if current_user.unconfirmed_email.present? %>
+        <div id="email-change-pending" class="callout secondary">
+          <p><strong><%= t("decidim.account.email_change.title") %></strong></p>
+          <p><%= t("decidim.account.email_change.body1", unconfirmed_email: current_user.unconfirmed_email) %></p>
+          <p>
+            <%== t(
+                   "decidim.account.email_change.body2",
+                   resend_link: link_to(t("decidim.account.email_change.send_again"), resend_confirmation_instructions_account_path, role: :button, method: :post, remote: true),
+                   cancel_link: link_to(t("decidim.account.email_change.cancel"), cancel_email_change_account_path, role: :button, method: :post, remote: true)) %>
+          </p>
+        </div>
+      <% end %>
+
+      <%= form_required_explanation %>
+
+      <%= f.text_field :name, autocomplete: "name" %>
+      <%= f.text_field :nickname, autocomplete: "nickname" %>
+      <%= f.email_field :email, disabled: current_user.unconfirmed_email.present?, autocomplete: "email" %>
+      <%= f.url_field :personal_url, autocomplete: "url" %>
+      <%= f.text_area :about, rows: 5 %>
+
+      <% if @account.organization.available_locales.size > 1 %>
+        <%= f.collection_select(
+              :locale,
+              @account.organization.available_locales,
+              :to_s,
+              ->(locale) {locale_name(locale) }
+            ) %>
+      <% else %>
+        <%= f.collection_select(
+              :locale,
+              @account.organization.available_locales,
+              :to_s,
+              ->(locale) {locale_name(locale) },
+              {},
+              { disabled: true }
+            ) %>
+      <% end %>
+
+      <p class="help-text"><%= t(".available_locales_helper") %></p>
+
+      <% if @account.errors[:password].any? || @account.errors[:password_confirmation].any? %>
+        <%= render partial: "password_fields", locals: { form: f } %>
+      <% else %>
+        <% if current_organization.sign_in_enabled? %>
+          <p>
+            <button type="button" data-toggle="passwordChange" class="link change-password"><%= t ".change_password" %></button>
+          </p>
+          <div id="passwordChange" class="toggle-show" data-toggler=".is-expanded">
+            <%= render partial: "password_fields", locals: { form: f } %>
+          </div>
+        <% end %>
+      <% end %>
+
+      <%= f.submit t(".update_account") %>
+    </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/decidim/devise/registrations/new.html.erb b/app/views/decidim/devise/registrations/new.html.erb
index a4bb86b6..c521c707 100644
--- a/app/views/decidim/devise/registrations/new.html.erb
+++ b/app/views/decidim/devise/registrations/new.html.erb
@@ -30,33 +30,33 @@
 
             <div class="user-person">
               <div class="field">
-                <%= f.text_field :name, help_text: t(".username_help") %>
+                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "name" %>
               </div>
             </div>
 
             <div class="user-nickname">
               <div class="field">
-                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 } %>
+                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 }, autocomplete: "nickname" %>
               </div>
             </div>
 
             <div class="field">
-              <%= f.email_field :email %>
+              <%= f.email_field :email, autocomplete: "email" %>
             </div>
 
             <div class="field">
-              <%= f.password_field :password, help_text: t(".password_help", minimun_characters: ::PasswordValidator::MINIMUM_LENGTH), autocomplete: "off" %>
+              <%= f.password_field :password, password_field_options_for(:user) %>
             </div>
 
             <div class="field">
-              <%= f.password_field :password_confirmation %>
+              <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
             </div>
           </div>
         </div>
 
         <div class="card" id="card__tos">
           <div class="card__content">
-            <h3><%= t(".tos_title") %></h3>
+            <h2><%= t(".tos_title") %></h2>
 
             <p class="tos-text">
               <%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %>
@@ -70,7 +70,7 @@
 
         <div class="card" id="card__newsletter">
           <div class="card__content">
-            <h3><%= t(".newsletter_title") %></h3>
+            <h2><%= t(".newsletter_title") %></h2>
               <div class="field">
                 <%= f.check_box :newsletter, label: t(".newsletter"), checked: @form.newsletter %>
               </div>
diff --git a/app/views/decidim/devise/sessions/new.html.erb b/app/views/decidim/devise/sessions/new.html.erb
index 35188938..6525e388 100644
--- a/app/views/decidim/devise/sessions/new.html.erb
+++ b/app/views/decidim/devise/sessions/new.html.erb
@@ -30,10 +30,10 @@
               <%= decidim_form_for(resource, namespace: "session", as: resource_name, url: session_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
                 <div>
                   <div class="field">
-                    <%= f.email_field :email %>
+                    <%= f.email_field :email, autocomplete: "email" %>
                   </div>
                   <div class="field">
-                    <%= f.password_field :password, autocomplete: "off" %>
+                    <%= f.password_field :password, autocomplete: "current-password" %>
                   </div>
                 </div>
                   <% if devise_mapping.rememberable? %>
diff --git a/app/views/decidim/shared/_login_modal.html.erb b/app/views/decidim/shared/_login_modal.html.erb
index eed79188..c267fbd4 100644
--- a/app/views/decidim/shared/_login_modal.html.erb
+++ b/app/views/decidim/shared/_login_modal.html.erb
@@ -1,6 +1,6 @@
-<div class="reveal" id="loginModal" data-reveal>
+<div class="reveal" id="loginModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="loginModal-label">
   <div class="reveal__header">
-    <h2 class="reveal__title"><%= t(".please_sign_in") %></h2>
+    <h2 id="loginModal-label" class="reveal__title"><%= t(".please_sign_in") %></h2>
     <button class="close-button" data-close aria-label="<%= t(".close_modal") %>"
       type="button">
       <span aria-hidden="true">&times;</span>
diff --git a/app/views/layouts/decidim/_head.html.erb b/app/views/layouts/decidim/_head.html.erb
index 6e5af2df..ab7df62f 100644
--- a/app/views/layouts/decidim/_head.html.erb
+++ b/app/views/layouts/decidim/_head.html.erb
@@ -1,7 +1,6 @@
 <%= csrf_meta_tags %>
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
 <meta name="twitter:card" content="summary_large_image">
 <meta name="twitter:site" content="@<%= decidim_meta_twitter_handler %>">
 <meta name="twitter:title" content="<%= decidim_page_title %>">
@@ -18,7 +17,11 @@
   <meta name="theme-color" content="<%= current_organization.colors["theme"] %>">
 <% end %>
 
+<%= legacy_favicon %>
 <%= favicon %>
+<%= apple_favicon %>
+<link rel="manifest" href="/manifest.webmanifest">
+
 <%= stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= invisible_captcha_styles %>
 <%= organization_colors %>
diff --git a/app/views/layouts/decidim/admin/_header.html.erb b/app/views/layouts/decidim/admin/_header.html.erb
index b51a34c2..60ce5e62 100644
--- a/app/views/layouts/decidim/admin/_header.html.erb
+++ b/app/views/layouts/decidim/admin/_header.html.erb
@@ -1,5 +1,8 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
+<%= legacy_favicon %>
+<%= favicon %>
+<%= apple_favicon %>
 <%= stylesheet_pack_tag "decidim_admin", media: "all" %>
 <%= javascript_pack_tag "decidim_admin", defer: false %>
 <%= organization_colors %>
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index a779b521..7b154d56 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -110,6 +110,7 @@ ignore_unused:
   - decidim.authorization_handlers.osp_authorization_handler.*
   - decidim.authorization_handlers.osp_authorization_workflow.*
   - decidim.amendments.emendation.announcement.evaluating
+  - decidim.devise.registrations.new.password_help
   - decidim.events.budgets.pending_order.*
   - decidim.verifications.authorizations.first_login.actions.osp_authorization_handler
   - decidim.verifications.authorizations.first_login.actions.osp_authorization_workflow
diff --git a/config/initializers/decidim.rb b/config/initializers/decidim.rb
index b5577b2d..8e5408f8 100644
--- a/config/initializers/decidim.rb
+++ b/config/initializers/decidim.rb
@@ -92,7 +92,7 @@
     }
   end
 
-  config.base_uploads_path = "#{ENV["HEROKU_APP_NAME"]}/" if ENV["HEROKU_APP_NAME"].present?
+  config.base_uploads_path = "#{ENV.fetch("HEROKU_APP_NAME", nil)}/" if ENV["HEROKU_APP_NAME"].present?
 end
 
 Rails.application.config.i18n.available_locales = Decidim.available_locales
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c8b20ba6..1231fdd2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -11,6 +11,17 @@ en:
   decidim:
     accessibility:
       skip_button: Skip button
+    account:
+      email_change:
+        body1: We have sent an email to %{unconfirmed_email} to verify your new email address.
+        body2: Need us to send the verification email again? %{resend_link} or %{cancel_link}.
+        cancel: cancel
+        send_again: Send again
+        title: Email change verification
+      show:
+        available_locales_helper: Choose the language you want to use to browse and receive notifications on the platform.
+        change_password: Change password
+        update_account: Update account
     admin:
       participatory_space_private_users:
         create:
@@ -32,6 +43,10 @@ en:
         name: Identity Verification Form
       osp_authorization_workflow:
         name: Authorization procedure
+    devise:
+      registrations:
+        new:
+          password_help: "%{minimun_characters} characters minimum, must not be too common (e.g. 123456) and must be different from your nickname and your email."
     events:
       budgets:
         pending_order:
@@ -77,6 +92,7 @@ en:
         account: Account
         conversations: Conversations
         notifications: Notifications
+        profile: My account
   rack_attack:
     too_many_requests:
       message: Your connection has been slowed because server received too many requests.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 9a2ec371..0dda0272 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -11,6 +11,17 @@ fr:
   decidim:
     accessibility:
       skip_button: Passer au contenu principal
+    account:
+      email_change:
+        body1: Nous avons envoyé un e-mail à %{unconfirmed_email} pour vérifier votre nouvelle adresse e-mail.
+        body2: Envoyer à nouveau l'e-mail de vérification ? %{resend_link} ou %{cancel_link}.
+        cancel: annuler
+        send_again: Envoyer à nouveau
+        title: Vérification du changement d'adresse e-mail
+      show:
+        available_locales_helper: Choisissez la langue que vous souhaitez utiliser pour naviguer et recevoir les notifications sur la plateforme.
+        change_password: Changer de mot de passe
+        update_account: Mettre à jour votre compte
     admin:
       participatory_space_private_users:
         create:
@@ -92,6 +103,7 @@ fr:
         account: Mon compte
         conversations: Conversations
         notifications: Notifications
+        profile: Mon compte
   rack_attack:
     too_many_requests:
       message: Il semblerait que vous fassiez trop de requetes sur notre serveur, votre connexion a ete ralentie.
diff --git a/db/migrate/20180611124795_add_secondary_hosts_to_organizations.decidim.rb b/db/migrate/20180611124795_add_secondary_hosts_to_organizations.decidim.rb
index e9e10032..a77bdb47 100644
--- a/db/migrate/20180611124795_add_secondary_hosts_to_organizations.decidim.rb
+++ b/db/migrate/20180611124795_add_secondary_hosts_to_organizations.decidim.rb
@@ -4,6 +4,7 @@
 
 class AddSecondaryHostsToOrganizations < ActiveRecord::Migration[5.0]
   def change
-    add_column :decidim_organizations, :secondary_hosts, :string, array: true, default: [], index: true
+    add_column :decidim_organizations, :secondary_hosts, :string, array: true, default: []
+    add_index :decidim_organizations, :secondary_hosts
   end
 end
diff --git a/db/migrate/20180611124847_add_version_to_action_logs.decidim.rb b/db/migrate/20180611124847_add_version_to_action_logs.decidim.rb
index a9141efb..848ea334 100644
--- a/db/migrate/20180611124847_add_version_to_action_logs.decidim.rb
+++ b/db/migrate/20180611124847_add_version_to_action_logs.decidim.rb
@@ -8,7 +8,8 @@ class ActionLog < ApplicationRecord
   end
 
   def up
-    add_column :decidim_action_logs, :version_id, :integer, index: true
+    add_column :decidim_action_logs, :version_id, :integer
+    add_index :decidim_action_logs, :version_id
 
     ActionLog.find_each do |action_log|
       version_id = action_log.extra.dig("version", "id")
diff --git a/db/migrate/20180611124854_add_accepted_tos_version_field_to_users.decidim.rb b/db/migrate/20180611124854_add_accepted_tos_version_field_to_users.decidim.rb
index b74e8e6f..1cb5fbd2 100644
--- a/db/migrate/20180611124854_add_accepted_tos_version_field_to_users.decidim.rb
+++ b/db/migrate/20180611124854_add_accepted_tos_version_field_to_users.decidim.rb
@@ -7,6 +7,7 @@ class Organization < ApplicationRecord
     self.table_name = :decidim_organizations
     has_many :users, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
   end
+
   class User < ApplicationRecord
     self.table_name = :decidim_users
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
diff --git a/db/migrate/20180611124866_add_promoted_flag_to_processes.decidim_participatory_processes.rb b/db/migrate/20180611124866_add_promoted_flag_to_processes.decidim_participatory_processes.rb
index a5984662..f6101952 100644
--- a/db/migrate/20180611124866_add_promoted_flag_to_processes.decidim_participatory_processes.rb
+++ b/db/migrate/20180611124866_add_promoted_flag_to_processes.decidim_participatory_processes.rb
@@ -4,6 +4,7 @@
 
 class AddPromotedFlagToProcesses < ActiveRecord::Migration[5.0]
   def change
-    add_column :decidim_participatory_processes, :promoted, :boolean, default: false, index: true
+    add_column :decidim_participatory_processes, :promoted, :boolean, default: false
+    add_index :decidim_participatory_processes, :promoted
   end
 end
diff --git a/db/migrate/20180611124870_add_published_at_to_processes.decidim_participatory_processes.rb b/db/migrate/20180611124870_add_published_at_to_processes.decidim_participatory_processes.rb
index ef5eff45..09f91899 100644
--- a/db/migrate/20180611124870_add_published_at_to_processes.decidim_participatory_processes.rb
+++ b/db/migrate/20180611124870_add_published_at_to_processes.decidim_participatory_processes.rb
@@ -4,6 +4,7 @@
 
 class AddPublishedAtToProcesses < ActiveRecord::Migration[5.0]
   def change
-    add_column :decidim_participatory_processes, :published_at, :datetime, index: true
+    add_column :decidim_participatory_processes, :published_at, :datetime
+    add_index :decidim_participatory_processes, :published_at
   end
 end
diff --git a/db/migrate/20180611124890_add_attachment_collection_to_attachments.decidim_participatory_processes.rb b/db/migrate/20180611124890_add_attachment_collection_to_attachments.decidim_participatory_processes.rb
index 7870b4b8..1ef3a14c 100644
--- a/db/migrate/20180611124890_add_attachment_collection_to_attachments.decidim_participatory_processes.rb
+++ b/db/migrate/20180611124890_add_attachment_collection_to_attachments.decidim_participatory_processes.rb
@@ -4,7 +4,8 @@
 
 class AddAttachmentCollectionToAttachments < ActiveRecord::Migration[5.1]
   def change
-    add_column :decidim_attachments, :attachment_collection_id, :integer, null: true, index: { name: "index_decidim_attachments_attachment_collection_id" }
+    add_column :decidim_attachments, :attachment_collection_id, :integer, null: true
+    add_index :decidim_attachments, :attachment_collection_id, name: "index_decidim_attachments_attachment_collection_id"
     add_foreign_key :decidim_attachments, :decidim_attachment_collections, column: :attachment_collection_id, on_delete: :nullify,
                                                                            name: "fk_decidim_attachments_attachment_collection_id"
   end
diff --git a/db/migrate/20180611124913_add_user_group_id_to_comments.decidim_comments.rb b/db/migrate/20180611124913_add_user_group_id_to_comments.decidim_comments.rb
index f9305f18..52e62a4d 100644
--- a/db/migrate/20180611124913_add_user_group_id_to_comments.decidim_comments.rb
+++ b/db/migrate/20180611124913_add_user_group_id_to_comments.decidim_comments.rb
@@ -4,6 +4,7 @@
 
 class AddUserGroupIdToComments < ActiveRecord::Migration[5.0]
   def change
-    add_column :decidim_comments_comments, :decidim_user_group_id, :integer, index: true
+    add_column :decidim_comments_comments, :decidim_user_group_id, :integer
+    add_index :decidim_comments_comments, :decidim_user_group_id
   end
 end
diff --git a/db/migrate/20180611124918_close_a_meeting.decidim_meetings.rb b/db/migrate/20180611124918_close_a_meeting.decidim_meetings.rb
index 572f12f2..5378714b 100644
--- a/db/migrate/20180611124918_close_a_meeting.decidim_meetings.rb
+++ b/db/migrate/20180611124918_close_a_meeting.decidim_meetings.rb
@@ -8,6 +8,7 @@ def change
     add_column :decidim_meetings_meetings, :attendees_count, :integer
     add_column :decidim_meetings_meetings, :contributions_count, :integer
     add_column :decidim_meetings_meetings, :attending_organizations, :text
-    add_column :decidim_meetings_meetings, :closed_at, :time, index: true
+    add_column :decidim_meetings_meetings, :closed_at, :time
+    add_index :decidim_meetings_meetings, :closed_at
   end
 end
diff --git a/db/migrate/20180611124938_add_user_group_id_to_proposals.decidim_proposals.rb b/db/migrate/20180611124938_add_user_group_id_to_proposals.decidim_proposals.rb
index f942539d..38b8c78c 100644
--- a/db/migrate/20180611124938_add_user_group_id_to_proposals.decidim_proposals.rb
+++ b/db/migrate/20180611124938_add_user_group_id_to_proposals.decidim_proposals.rb
@@ -4,6 +4,7 @@
 
 class AddUserGroupIdToProposals < ActiveRecord::Migration[5.0]
   def change
-    add_column :decidim_proposals_proposals, :decidim_user_group_id, :integer, index: true
+    add_column :decidim_proposals_proposals, :decidim_user_group_id, :integer
+    add_index :decidim_proposals_proposals, :decidim_user_group_id
   end
 end
diff --git a/db/migrate/20180611124939_add_answers_to_proposals.decidim_proposals.rb b/db/migrate/20180611124939_add_answers_to_proposals.decidim_proposals.rb
index 71068b5f..b5d304aa 100644
--- a/db/migrate/20180611124939_add_answers_to_proposals.decidim_proposals.rb
+++ b/db/migrate/20180611124939_add_answers_to_proposals.decidim_proposals.rb
@@ -4,8 +4,10 @@
 
 class AddAnswersToProposals < ActiveRecord::Migration[5.0]
   def change
-    add_column :decidim_proposals_proposals, :state, :string, index: true
-    add_column :decidim_proposals_proposals, :answered_at, :datetime, index: true
+    add_column :decidim_proposals_proposals, :state, :string
+    add_index :decidim_proposals_proposals, :state
+    add_column :decidim_proposals_proposals, :answered_at, :datetime
+    add_index :decidim_proposals_proposals, :answered_at
     add_column :decidim_proposals_proposals, :answer, :jsonb
   end
 end
diff --git a/db/migrate/20180611124952_add_published_at_to_proposals.decidim_proposals.rb b/db/migrate/20180611124952_add_published_at_to_proposals.decidim_proposals.rb
index e43a6bc5..d6d65a2e 100644
--- a/db/migrate/20180611124952_add_published_at_to_proposals.decidim_proposals.rb
+++ b/db/migrate/20180611124952_add_published_at_to_proposals.decidim_proposals.rb
@@ -4,7 +4,8 @@
 
 class AddPublishedAtToProposals < ActiveRecord::Migration[5.1]
   def up
-    add_column :decidim_proposals_proposals, :published_at, :datetime, index: true
+    add_column :decidim_proposals_proposals, :published_at, :datetime
+    add_index :decidim_proposals_proposals, :published_at
     # rubocop:disable Rails/SkipsModelValidations
     Decidim::Proposals::Proposal.update_all("published_at = updated_at")
     # rubocop:enable Rails/SkipsModelValidations
diff --git a/db/migrate/20180611124968_add_position_to_surveys_questions.decidim_surveys.rb b/db/migrate/20180611124968_add_position_to_surveys_questions.decidim_surveys.rb
index da836dd6..0c183868 100644
--- a/db/migrate/20180611124968_add_position_to_surveys_questions.decidim_surveys.rb
+++ b/db/migrate/20180611124968_add_position_to_surveys_questions.decidim_surveys.rb
@@ -4,6 +4,7 @@
 
 class AddPositionToSurveysQuestions < ActiveRecord::Migration[5.0]
   def change
-    add_column :decidim_surveys_survey_questions, :position, :integer, index: true
+    add_column :decidim_surveys_survey_questions, :position, :integer
+    add_index :decidim_surveys_survey_questions, :position
   end
 end
diff --git a/db/migrate/20180611124990_add_external_id_to_results.decidim_accountability.rb b/db/migrate/20180611124990_add_external_id_to_results.decidim_accountability.rb
index 9df48f29..2fe8f341 100644
--- a/db/migrate/20180611124990_add_external_id_to_results.decidim_accountability.rb
+++ b/db/migrate/20180611124990_add_external_id_to_results.decidim_accountability.rb
@@ -4,6 +4,7 @@
 
 class AddExternalIdToResults < ActiveRecord::Migration[5.1]
   def change
-    add_column :decidim_accountability_results, :external_id, :string, index: true
+    add_column :decidim_accountability_results, :external_id, :string
+    add_index :decidim_accountability_results, :external_id
   end
 end
diff --git a/db/migrate/20180611125005_add_cancel_data_to_sortition.decidim_sortitions.rb b/db/migrate/20180611125005_add_cancel_data_to_sortition.decidim_sortitions.rb
index 3c1b0dc8..68d029ca 100644
--- a/db/migrate/20180611125005_add_cancel_data_to_sortition.decidim_sortitions.rb
+++ b/db/migrate/20180611125005_add_cancel_data_to_sortition.decidim_sortitions.rb
@@ -6,6 +6,7 @@ class AddCancelDataToSortition < ActiveRecord::Migration[5.1]
   def change
     add_column :decidim_module_sortitions_sortitions, :cancel_reason, :jsonb
     add_column :decidim_module_sortitions_sortitions, :cancelled_on, :datetime
-    add_column :decidim_module_sortitions_sortitions, :cancelled_by_user_id, :integer, index: true
+    add_column :decidim_module_sortitions_sortitions, :cancelled_by_user_id, :integer
+    add_index :decidim_module_sortitions_sortitions, :cancelled_by_user_id
   end
 end
diff --git a/db/migrate/20180611125012_add_author_to_decidim_blogs_posts.decidim_blogs.rb b/db/migrate/20180611125012_add_author_to_decidim_blogs_posts.decidim_blogs.rb
index 64180ceb..6389564d 100644
--- a/db/migrate/20180611125012_add_author_to_decidim_blogs_posts.decidim_blogs.rb
+++ b/db/migrate/20180611125012_add_author_to_decidim_blogs_posts.decidim_blogs.rb
@@ -4,6 +4,7 @@
 
 class AddAuthorToDecidimBlogsPosts < ActiveRecord::Migration[5.1]
   def change
-    add_column :decidim_blogs_posts, :decidim_author_id, :integer, index: true
+    add_column :decidim_blogs_posts, :decidim_author_id, :integer
+    add_index :decidim_blogs_posts, :decidim_author_id
   end
 end
diff --git a/db/migrate/20181012230435_add_code_to_decidim_meetings_registrations.decidim_meetings.rb b/db/migrate/20181012230435_add_code_to_decidim_meetings_registrations.decidim_meetings.rb
index 10281570..9d1b09d1 100644
--- a/db/migrate/20181012230435_add_code_to_decidim_meetings_registrations.decidim_meetings.rb
+++ b/db/migrate/20181012230435_add_code_to_decidim_meetings_registrations.decidim_meetings.rb
@@ -4,6 +4,7 @@
 
 class AddCodeToDecidimMeetingsRegistrations < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_meetings_registrations, :code, :string, index: true
+    add_column :decidim_meetings_registrations, :code, :string
+    add_index :decidim_meetings_registrations, :code
   end
 end
diff --git a/db/migrate/20181012230440_move_authorships_to_coauthorships.decidim_proposals.rb b/db/migrate/20181012230440_move_authorships_to_coauthorships.decidim_proposals.rb
index e9259205..63005c0b 100644
--- a/db/migrate/20181012230440_move_authorships_to_coauthorships.decidim_proposals.rb
+++ b/db/migrate/20181012230440_move_authorships_to_coauthorships.decidim_proposals.rb
@@ -6,6 +6,7 @@ class MoveAuthorshipsToCoauthorships < ActiveRecord::Migration[5.1]
   class Proposal < ApplicationRecord
     self.table_name = :decidim_proposals_proposals
   end
+
   class Coauthorship < ApplicationRecord
     self.table_name = :decidim_coauthorships
   end
diff --git a/db/migrate/20181220220351_destroy_deleted_users_follows.decidim.rb b/db/migrate/20181220220351_destroy_deleted_users_follows.decidim.rb
index 68cfc3c1..3ed897d0 100644
--- a/db/migrate/20181220220351_destroy_deleted_users_follows.decidim.rb
+++ b/db/migrate/20181220220351_destroy_deleted_users_follows.decidim.rb
@@ -6,6 +6,7 @@ class DestroyDeletedUsersFollows < ActiveRecord::Migration[5.2]
   class Follow < ApplicationRecord
     self.table_name = "decidim_follows"
   end
+
   class User < ApplicationRecord
     self.table_name = "decidim_users"
   end
diff --git a/db/migrate/20181220220427_make_authors_polymorphic_for_comments.decidim_comments.rb b/db/migrate/20181220220427_make_authors_polymorphic_for_comments.decidim_comments.rb
index b11ebc82..1e3cccc6 100644
--- a/db/migrate/20181220220427_make_authors_polymorphic_for_comments.decidim_comments.rb
+++ b/db/migrate/20181220220427_make_authors_polymorphic_for_comments.decidim_comments.rb
@@ -6,6 +6,7 @@ class MakeAuthorsPolymorphicForComments < ActiveRecord::Migration[5.2]
   class Comment < ApplicationRecord
     self.table_name = :decidim_comments_comments
   end
+
   def change
     add_column :decidim_comments_comments, :decidim_author_type, :string
 
diff --git a/db/migrate/20181220220428_make_author_polymorphic_for_comment_votes.decidim_comments.rb b/db/migrate/20181220220428_make_author_polymorphic_for_comment_votes.decidim_comments.rb
index e2128367..b0a3ec36 100644
--- a/db/migrate/20181220220428_make_author_polymorphic_for_comment_votes.decidim_comments.rb
+++ b/db/migrate/20181220220428_make_author_polymorphic_for_comment_votes.decidim_comments.rb
@@ -6,6 +6,7 @@ class MakeAuthorPolymorphicForCommentVotes < ActiveRecord::Migration[5.2]
   class CommentVote < ApplicationRecord
     self.table_name = :decidim_comments_comment_votes
   end
+
   def change
     add_column :decidim_comments_comment_votes, :decidim_author_type, :string
 
diff --git a/db/migrate/20181220220434_add_organization_as_author_to_debates.decidim_debates.rb b/db/migrate/20181220220434_add_organization_as_author_to_debates.decidim_debates.rb
index 7d62fad7..220fa641 100644
--- a/db/migrate/20181220220434_add_organization_as_author_to_debates.decidim_debates.rb
+++ b/db/migrate/20181220220434_add_organization_as_author_to_debates.decidim_debates.rb
@@ -7,9 +7,11 @@ class Debate < ApplicationRecord
     self.table_name = :decidim_debates_debates
     include Decidim::HasComponent
   end
+
   class User < ApplicationRecord
     self.table_name = :decidim_users
   end
+
   def change
     add_column :decidim_debates_debates, :decidim_author_type, :string
 
diff --git a/db/migrate/20190304203114_add_adress_to_projects.decidim_budgets.rb b/db/migrate/20190304203114_add_adress_to_projects.decidim_budgets.rb
deleted file mode 100644
index 5f4e9656..00000000
--- a/db/migrate/20190304203114_add_adress_to_projects.decidim_budgets.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-# This migration comes from decidim_budgets (originally 20180604135346)
-
-class AddAdressToProjects < ActiveRecord::Migration[5.1]
-  def change
-    add_column :decidim_budgets_projects, :address, :string unless column_exists?(:decidim_budgets_projects, :address)
-    add_column :decidim_budgets_projects, :latitude, :float unless column_exists?(:decidim_budgets_projects, :latitude)
-    add_column :decidim_budgets_projects, :longitude, :float unless column_exists?(:decidim_budgets_projects, :longitude)
-  end
-end
diff --git a/db/migrate/20190717132653_fix_user_names.decidim.rb b/db/migrate/20190717132653_fix_user_names.decidim.rb
index bac685a3..a6188626 100644
--- a/db/migrate/20190717132653_fix_user_names.decidim.rb
+++ b/db/migrate/20190717132653_fix_user_names.decidim.rb
@@ -11,10 +11,10 @@ def change
 
     weird_characters.each do |character|
       Decidim::UserBaseEntity.where(deleted_at: nil).where("name like '%#{character}%' escape '\' OR nickname like '%#{character}%' escape '\'").find_each do |entity|
-        Rails.logger.debug "detected character: #{character}"
-        Rails.logger.debug "UserBaseEntity ID: #{entity.id}"
-        Rails.logger.debug "#{entity.name} => #{entity.name.delete(characters_to_remove).strip}"
-        Rails.logger.debug "#{entity.nickname} => #{entity.nickname.delete(characters_to_remove).strip}"
+        Rails.logger.debug { "detected character: #{character}" }
+        Rails.logger.debug { "UserBaseEntity ID: #{entity.id}" }
+        Rails.logger.debug { "#{entity.name} => #{entity.name.delete(characters_to_remove).strip}" }
+        Rails.logger.debug { "#{entity.nickname} => #{entity.nickname.delete(characters_to_remove).strip}" }
 
         entity.name = entity.name.delete(characters_to_remove).strip
         sanitized_nickname = entity.nickname.delete(characters_to_remove).strip
diff --git a/db/migrate/20200923121750_move_proposal_endorsements_to_core_endorsements.decidim_proposals.rb b/db/migrate/20200923121750_move_proposal_endorsements_to_core_endorsements.decidim_proposals.rb
index cf96749c..f30a488d 100644
--- a/db/migrate/20200923121750_move_proposal_endorsements_to_core_endorsements.decidim_proposals.rb
+++ b/db/migrate/20200923121750_move_proposal_endorsements_to_core_endorsements.decidim_proposals.rb
@@ -7,9 +7,11 @@ class MoveProposalEndorsementsToCoreEndorsements < ActiveRecord::Migration[5.2]
   class ProposalEndorsement < ApplicationRecord
     self.table_name = :decidim_proposals_proposal_endorsements
   end
+
   class Endorsement < ApplicationRecord
     self.table_name = :decidim_endorsements
   end
+
   # Move ProposalEndorsements to Endorsements
   def up
     non_duplicated_group_endorsements = ProposalEndorsement.select(
diff --git a/db/migrate/20201126165606_add_commentable_counter_cache_to_results.decidim_accountability.rb b/db/migrate/20201126165606_add_commentable_counter_cache_to_results.decidim_accountability.rb
index 9d9030aa..32aae5ec 100644
--- a/db/migrate/20201126165606_add_commentable_counter_cache_to_results.decidim_accountability.rb
+++ b/db/migrate/20201126165606_add_commentable_counter_cache_to_results.decidim_accountability.rb
@@ -4,7 +4,8 @@
 
 class AddCommentableCounterCacheToResults < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_accountability_results, :comments_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_accountability_results, :comments_count, :integer, null: false, default: 0
+    add_index :decidim_accountability_results, :comments_count
     Decidim::Accountability::Result.reset_column_information
     Decidim::Accountability::Result.find_each(&:update_comments_count)
   end
diff --git a/db/migrate/20201126165615_add_commentable_counter_cache_to_posts.decidim_blogs.rb b/db/migrate/20201126165615_add_commentable_counter_cache_to_posts.decidim_blogs.rb
index f23665e4..1adad1ce 100644
--- a/db/migrate/20201126165615_add_commentable_counter_cache_to_posts.decidim_blogs.rb
+++ b/db/migrate/20201126165615_add_commentable_counter_cache_to_posts.decidim_blogs.rb
@@ -4,7 +4,8 @@
 
 class AddCommentableCounterCacheToPosts < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_blogs_posts, :comments_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_blogs_posts, :comments_count, :integer, null: false, default: 0
+    add_index :decidim_blogs_posts, :comments_count
     Decidim::Blogs::Post.reset_column_information
     Decidim::Blogs::Post.find_each(&:update_comments_count)
   end
diff --git a/db/migrate/20201126165622_move_budgets_to_own_model.decidim_budgets.rb b/db/migrate/20201126165622_move_budgets_to_own_model.decidim_budgets.rb
index be0e1e1e..9a691291 100644
--- a/db/migrate/20201126165622_move_budgets_to_own_model.decidim_budgets.rb
+++ b/db/migrate/20201126165622_move_budgets_to_own_model.decidim_budgets.rb
@@ -35,8 +35,10 @@ def up
   end
 
   def down
-    add_column :decidim_budgets_projects, :decidim_component_id, :integer, index: true
-    add_column :decidim_budgets_orders, :decidim_component_id, :integer, index: true
+    add_column :decidim_budgets_projects, :decidim_component_id, :integer
+    add_index :decidim_budgets_projects, :decidim_component_id
+    add_column :decidim_budgets_orders, :decidim_component_id, :integer
+    add_index :decidim_budgets_orders, :decidim_component_id
 
     Budget.find_each do |resource|
       revert_budget_to_component(resource)
diff --git a/db/migrate/20201126165624_add_selected_at_to_project.decidim_budgets.rb b/db/migrate/20201126165624_add_selected_at_to_project.decidim_budgets.rb
index 5a709ead..f71a6f11 100644
--- a/db/migrate/20201126165624_add_selected_at_to_project.decidim_budgets.rb
+++ b/db/migrate/20201126165624_add_selected_at_to_project.decidim_budgets.rb
@@ -4,6 +4,7 @@
 
 class AddSelectedAtToProject < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_budgets_projects, :selected_at, :date, index: true
+    add_column :decidim_budgets_projects, :selected_at, :date
+    add_index :decidim_budgets_projects, :selected_at
   end
 end
diff --git a/db/migrate/20201126165625_votes_enabled_to_votes_choices.decidim_budgets.rb b/db/migrate/20201126165625_votes_enabled_to_votes_choices.decidim_budgets.rb
index 66887335..c667ff1a 100644
--- a/db/migrate/20201126165625_votes_enabled_to_votes_choices.decidim_budgets.rb
+++ b/db/migrate/20201126165625_votes_enabled_to_votes_choices.decidim_budgets.rb
@@ -16,7 +16,7 @@ def up
         new_steps_settings = component["settings"]["steps"].each_with_object({}) do |(step, config), new_config|
           votes_value = config["votes_enabled"] ? "enabled" : "disabled"
 
-          new_config[step] = config.merge("votes": votes_value).except("votes_enabled")
+          new_config[step] = config.merge(votes: votes_value).except("votes_enabled")
           new_config
         end
         component["settings"]["steps"] = new_steps_settings
@@ -24,7 +24,7 @@ def up
       elsif default_step.present?
         votes_value = component["settings"]["default_step"]["votes_enabled"] ? "enabled" : "disabled"
 
-        new_default_step_settings = component["settings"]["default_step"].merge("votes": votes_value).except("votes_enabled")
+        new_default_step_settings = component["settings"]["default_step"].merge(votes: votes_value).except("votes_enabled")
         component["settings"]["default_step"] = new_default_step_settings
         component.save!
       end
diff --git a/db/migrate/20201126165626_add_commentable_counter_cache_to_projects.decidim_budgets.rb b/db/migrate/20201126165626_add_commentable_counter_cache_to_projects.decidim_budgets.rb
index 19d4696e..4cfa0b73 100644
--- a/db/migrate/20201126165626_add_commentable_counter_cache_to_projects.decidim_budgets.rb
+++ b/db/migrate/20201126165626_add_commentable_counter_cache_to_projects.decidim_budgets.rb
@@ -4,7 +4,8 @@
 
 class AddCommentableCounterCacheToProjects < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_budgets_projects, :comments_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_budgets_projects, :comments_count, :integer, null: false, default: 0
+    add_index :decidim_budgets_projects, :comments_count
     Decidim::Budgets::Project.reset_column_information
     Decidim::Budgets::Project.find_each(&:update_comments_count)
   end
diff --git a/db/migrate/20201126165628_add_commentable_counter_cache_to_comments.decidim_comments.rb b/db/migrate/20201126165628_add_commentable_counter_cache_to_comments.decidim_comments.rb
index b5f95631..f481f12f 100644
--- a/db/migrate/20201126165628_add_commentable_counter_cache_to_comments.decidim_comments.rb
+++ b/db/migrate/20201126165628_add_commentable_counter_cache_to_comments.decidim_comments.rb
@@ -4,7 +4,8 @@
 
 class AddCommentableCounterCacheToComments < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_comments_comments, :comments_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_comments_comments, :comments_count, :integer, null: false, default: 0
+    add_index :decidim_comments_comments, :comments_count
     Decidim::Comments::Comment.reset_column_information
     Decidim::Comments::Comment.find_each(&:update_comments_count)
   end
diff --git a/db/migrate/20201126165632_add_commentable_counter_cache_to_debates.decidim_debates.rb b/db/migrate/20201126165632_add_commentable_counter_cache_to_debates.decidim_debates.rb
index 160742df..3b3638e6 100644
--- a/db/migrate/20201126165632_add_commentable_counter_cache_to_debates.decidim_debates.rb
+++ b/db/migrate/20201126165632_add_commentable_counter_cache_to_debates.decidim_debates.rb
@@ -4,7 +4,8 @@
 
 class AddCommentableCounterCacheToDebates < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_debates_debates, :comments_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_debates_debates, :comments_count, :integer, null: false, default: 0
+    add_index :decidim_debates_debates, :comments_count
     Decidim::Debates::Debate.reset_column_information
 
     # rubocop:disable Rails/SkipsModelValidations
diff --git a/db/migrate/20201126165642_add_commentable_counter_cache_to_proposals.decidim_proposals.rb b/db/migrate/20201126165642_add_commentable_counter_cache_to_proposals.decidim_proposals.rb
index d671b3c9..d88003c4 100644
--- a/db/migrate/20201126165642_add_commentable_counter_cache_to_proposals.decidim_proposals.rb
+++ b/db/migrate/20201126165642_add_commentable_counter_cache_to_proposals.decidim_proposals.rb
@@ -4,8 +4,10 @@
 
 class AddCommentableCounterCacheToProposals < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_proposals_proposals, :comments_count, :integer, null: false, default: 0, index: true
-    add_column :decidim_proposals_collaborative_drafts, :comments_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_proposals_proposals, :comments_count, :integer, null: false, default: 0
+    add_index :decidim_proposals_proposals, :comments_count
+    add_column :decidim_proposals_collaborative_drafts, :comments_count, :integer, null: false, default: 0
+    add_index :decidim_proposals_collaborative_drafts, :comments_count
     Decidim::Proposals::Proposal.reset_column_information
     Decidim::Proposals::Proposal.find_each(&:update_comments_count)
     Decidim::Proposals::CollaborativeDraft.reset_column_information
diff --git a/db/migrate/20201126165645_add_commentable_counter_cache_to_sortitions.decidim_sortitions.rb b/db/migrate/20201126165645_add_commentable_counter_cache_to_sortitions.decidim_sortitions.rb
index f693b108..c5c72c77 100644
--- a/db/migrate/20201126165645_add_commentable_counter_cache_to_sortitions.decidim_sortitions.rb
+++ b/db/migrate/20201126165645_add_commentable_counter_cache_to_sortitions.decidim_sortitions.rb
@@ -4,7 +4,8 @@
 
 class AddCommentableCounterCacheToSortitions < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_sortitions_sortitions, :comments_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_sortitions_sortitions, :comments_count, :integer, null: false, default: 0
+    add_index :decidim_sortitions_sortitions, :comments_count
     Decidim::Sortitions::Sortition.reset_column_information
     Decidim::Sortitions::Sortition.find_each(&:update_comments_count)
   end
diff --git a/db/migrate/20210521003337_add_followable_counter_cache_to_users.decidim.rb b/db/migrate/20210521003337_add_followable_counter_cache_to_users.decidim.rb
index 3ea2d6c5..747edb8a 100644
--- a/db/migrate/20210521003337_add_followable_counter_cache_to_users.decidim.rb
+++ b/db/migrate/20210521003337_add_followable_counter_cache_to_users.decidim.rb
@@ -4,7 +4,8 @@
 
 class AddFollowableCounterCacheToUsers < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_users, :follows_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_users, :follows_count, :integer, null: false, default: 0
+    add_index :decidim_users, :follows_count
 
     reversible do |dir|
       dir.up do
diff --git a/db/migrate/20210521003343_add_promoted_flag_to_decidim_participatory_process_groups.decidim_participatory_processes.rb b/db/migrate/20210521003343_add_promoted_flag_to_decidim_participatory_process_groups.decidim_participatory_processes.rb
index 5598cd39..67fede30 100644
--- a/db/migrate/20210521003343_add_promoted_flag_to_decidim_participatory_process_groups.decidim_participatory_processes.rb
+++ b/db/migrate/20210521003343_add_promoted_flag_to_decidim_participatory_process_groups.decidim_participatory_processes.rb
@@ -4,6 +4,7 @@
 
 class AddPromotedFlagToDecidimParticipatoryProcessGroups < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_participatory_process_groups, :promoted, :boolean, default: false, index: true
+    add_column :decidim_participatory_process_groups, :promoted, :boolean, default: false
+    add_index :decidim_participatory_process_groups, :promoted
   end
 end
diff --git a/db/migrate/20210521003345_add_followable_counter_cache_to_participatory_processes.decidim_participatory_processes.rb b/db/migrate/20210521003345_add_followable_counter_cache_to_participatory_processes.decidim_participatory_processes.rb
index 4a48b5f4..c354a227 100644
--- a/db/migrate/20210521003345_add_followable_counter_cache_to_participatory_processes.decidim_participatory_processes.rb
+++ b/db/migrate/20210521003345_add_followable_counter_cache_to_participatory_processes.decidim_participatory_processes.rb
@@ -4,7 +4,8 @@
 
 class AddFollowableCounterCacheToParticipatoryProcesses < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_participatory_processes, :follows_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_participatory_processes, :follows_count, :integer, null: false, default: 0
+    add_index :decidim_participatory_processes, :follows_count
 
     reversible do |dir|
       dir.up do
diff --git a/db/migrate/20210521003347_add_followable_counter_cache_to_assemblies.decidim_assemblies.rb b/db/migrate/20210521003347_add_followable_counter_cache_to_assemblies.decidim_assemblies.rb
index d3d2e34d..d547fc5a 100644
--- a/db/migrate/20210521003347_add_followable_counter_cache_to_assemblies.decidim_assemblies.rb
+++ b/db/migrate/20210521003347_add_followable_counter_cache_to_assemblies.decidim_assemblies.rb
@@ -4,7 +4,8 @@
 
 class AddFollowableCounterCacheToAssemblies < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_assemblies, :follows_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_assemblies, :follows_count, :integer, null: false, default: 0
+    add_index :decidim_assemblies, :follows_count
 
     reversible do |dir|
       dir.up do
diff --git a/db/migrate/20210521003351_add_followable_counter_cache_to_meetings.decidim_meetings.rb b/db/migrate/20210521003351_add_followable_counter_cache_to_meetings.decidim_meetings.rb
index 1dcab681..a991eb74 100644
--- a/db/migrate/20210521003351_add_followable_counter_cache_to_meetings.decidim_meetings.rb
+++ b/db/migrate/20210521003351_add_followable_counter_cache_to_meetings.decidim_meetings.rb
@@ -4,7 +4,8 @@
 
 class AddFollowableCounterCacheToMeetings < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_meetings_meetings, :follows_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_meetings_meetings, :follows_count, :integer, null: false, default: 0
+    add_index :decidim_meetings_meetings, :follows_count
 
     reversible do |dir|
       dir.up do
diff --git a/db/migrate/20210521003352_add_followable_counter_cache_to_proposals.decidim_proposals.rb b/db/migrate/20210521003352_add_followable_counter_cache_to_proposals.decidim_proposals.rb
index fce5b1cd..11f15fdc 100644
--- a/db/migrate/20210521003352_add_followable_counter_cache_to_proposals.decidim_proposals.rb
+++ b/db/migrate/20210521003352_add_followable_counter_cache_to_proposals.decidim_proposals.rb
@@ -4,7 +4,8 @@
 
 class AddFollowableCounterCacheToProposals < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_proposals_proposals, :follows_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_proposals_proposals, :follows_count, :integer, null: false, default: 0
+    add_index :decidim_proposals_proposals, :follows_count
 
     reversible do |dir|
       dir.up do
diff --git a/db/migrate/20210521003353_add_followable_counter_cache_to_collaborative_drafts.decidim_proposals.rb b/db/migrate/20210521003353_add_followable_counter_cache_to_collaborative_drafts.decidim_proposals.rb
index 61761646..05982274 100644
--- a/db/migrate/20210521003353_add_followable_counter_cache_to_collaborative_drafts.decidim_proposals.rb
+++ b/db/migrate/20210521003353_add_followable_counter_cache_to_collaborative_drafts.decidim_proposals.rb
@@ -4,7 +4,8 @@
 
 class AddFollowableCounterCacheToCollaborativeDrafts < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_proposals_collaborative_drafts, :follows_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_proposals_collaborative_drafts, :follows_count, :integer, null: false, default: 0
+    add_index :decidim_proposals_collaborative_drafts, :follows_count
 
     reversible do |dir|
       dir.up do
diff --git a/db/migrate/20210521003354_add_followable_counter_cache_to_budgets.decidim_budgets.rb b/db/migrate/20210521003354_add_followable_counter_cache_to_budgets.decidim_budgets.rb
index e56760e7..0697913a 100644
--- a/db/migrate/20210521003354_add_followable_counter_cache_to_budgets.decidim_budgets.rb
+++ b/db/migrate/20210521003354_add_followable_counter_cache_to_budgets.decidim_budgets.rb
@@ -4,7 +4,8 @@
 
 class AddFollowableCounterCacheToBudgets < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_budgets_projects, :follows_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_budgets_projects, :follows_count, :integer, null: false, default: 0
+    add_index :decidim_budgets_projects, :follows_count
 
     reversible do |dir|
       dir.up do
diff --git a/db/migrate/20210521003358_add_followable_counter_cache_to_debates.decidim_debates.rb b/db/migrate/20210521003358_add_followable_counter_cache_to_debates.decidim_debates.rb
index 1971abe8..46ca0cac 100644
--- a/db/migrate/20210521003358_add_followable_counter_cache_to_debates.decidim_debates.rb
+++ b/db/migrate/20210521003358_add_followable_counter_cache_to_debates.decidim_debates.rb
@@ -4,7 +4,8 @@
 
 class AddFollowableCounterCacheToDebates < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_debates_debates, :follows_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_debates_debates, :follows_count, :integer, null: false, default: 0
+    add_index :decidim_debates_debates, :follows_count
 
     reversible do |dir|
       dir.up do
diff --git a/db/migrate/20210521003359_add_followable_counter_cache_to_blogs.decidim_blogs.rb b/db/migrate/20210521003359_add_followable_counter_cache_to_blogs.decidim_blogs.rb
index cec09558..8f31c6a5 100644
--- a/db/migrate/20210521003359_add_followable_counter_cache_to_blogs.decidim_blogs.rb
+++ b/db/migrate/20210521003359_add_followable_counter_cache_to_blogs.decidim_blogs.rb
@@ -4,7 +4,8 @@
 
 class AddFollowableCounterCacheToBlogs < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_blogs_posts, :follows_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_blogs_posts, :follows_count, :integer, null: false, default: 0
+    add_index :decidim_blogs_posts, :follows_count
 
     reversible do |dir|
       dir.up do
diff --git a/db/migrate/20221104094515_add_published_at_to_meetings.decidim_meetings.rb b/db/migrate/20221104094515_add_published_at_to_meetings.decidim_meetings.rb
index 7b2fc16e..d9cd742b 100644
--- a/db/migrate/20221104094515_add_published_at_to_meetings.decidim_meetings.rb
+++ b/db/migrate/20221104094515_add_published_at_to_meetings.decidim_meetings.rb
@@ -4,6 +4,7 @@
 
 class AddPublishedAtToMeetings < ActiveRecord::Migration[5.2]
   def change
-    add_column :decidim_meetings_meetings, :published_at, :datetime, index: true
+    add_column :decidim_meetings_meetings, :published_at, :datetime
+    add_index :decidim_meetings_meetings, :published_at
   end
 end
diff --git a/db/migrate/20221104094520_drop_decidim_meetings_minutes_table.decidim_meetings.rb b/db/migrate/20221104094520_drop_decidim_meetings_minutes_table.decidim_meetings.rb
index b7686a68..d146c501 100644
--- a/db/migrate/20221104094520_drop_decidim_meetings_minutes_table.decidim_meetings.rb
+++ b/db/migrate/20221104094520_drop_decidim_meetings_minutes_table.decidim_meetings.rb
@@ -74,7 +74,7 @@ def down
 private
 
 def blank_minutes?(meeting)
-  meeting.video_url.blank? &&
+  (meeting.video_url.blank? &&
     meeting.audio_url.blank? &&
-    meeting.minutes_description.blank? || meeting.minutes_description.is_a?(Hash) && meeting.minutes_description.values.all?(&:blank?)
+    meeting.minutes_description.blank?) || (meeting.minutes_description.is_a?(Hash) && meeting.minutes_description.values.all?(&:blank?))
 end
diff --git a/db/migrate/20221104094521_merge_minutes_with_closing_report_in_meetings_table.decidim_meetings.rb b/db/migrate/20221104094521_merge_minutes_with_closing_report_in_meetings_table.decidim_meetings.rb
index c4d49de9..230b1dcb 100644
--- a/db/migrate/20221104094521_merge_minutes_with_closing_report_in_meetings_table.decidim_meetings.rb
+++ b/db/migrate/20221104094521_merge_minutes_with_closing_report_in_meetings_table.decidim_meetings.rb
@@ -55,5 +55,5 @@ def merge_closing_report(meeting)
 
 def minutes_data?(meeting)
   [meeting.video_url, meeting.audio_url].any?(&:present?) ||
-    meeting.minutes_description.is_a?(Hash) && meeting.minutes_description.values.any?(&:present?)
+    (meeting.minutes_description.is_a?(Hash) && meeting.minutes_description.values.any?(&:present?))
 end
diff --git a/db/migrate/20221104094528_add_status_to_meetings_questions.decidim_meetings.rb b/db/migrate/20221104094528_add_status_to_meetings_questions.decidim_meetings.rb
index 2ca71073..6e6fc4d5 100644
--- a/db/migrate/20221104094528_add_status_to_meetings_questions.decidim_meetings.rb
+++ b/db/migrate/20221104094528_add_status_to_meetings_questions.decidim_meetings.rb
@@ -4,6 +4,7 @@
 
 class AddStatusToMeetingsQuestions < ActiveRecord::Migration[6.0]
   def change
-    add_column :decidim_meetings_questions, :status, :integer, default: 0, index: true
+    add_column :decidim_meetings_questions, :status, :integer, default: 0
+    add_index :decidim_meetings_questions, :status
   end
 end
diff --git a/db/migrate/20221104094530_add_state_field_to_meeting.decidim_meetings.rb b/db/migrate/20221104094530_add_state_field_to_meeting.decidim_meetings.rb
index 10c06fcb..ebd6331b 100644
--- a/db/migrate/20221104094530_add_state_field_to_meeting.decidim_meetings.rb
+++ b/db/migrate/20221104094530_add_state_field_to_meeting.decidim_meetings.rb
@@ -4,6 +4,7 @@
 
 class AddStateFieldToMeeting < ActiveRecord::Migration[6.0]
   def change
-    add_column :decidim_meetings_meetings, :state, :string, index: true
+    add_column :decidim_meetings_meetings, :state, :string
+    add_index :decidim_meetings_meetings, :state
   end
 end
diff --git a/db/migrate/20240702145136_add_service_name_to_active_storage_blobs.decidim.rb b/db/migrate/20240702145136_add_service_name_to_active_storage_blobs.decidim.rb
new file mode 100644
index 00000000..2864efe1
--- /dev/null
+++ b/db/migrate/20240702145136_add_service_name_to_active_storage_blobs.decidim.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20210831181634)
+
+# This migration comes from active_storage (originally 20190112182829)
+class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
+  def up
+    return if column_exists?(:active_storage_blobs, :service_name)
+
+    add_column :active_storage_blobs, :service_name, :string
+    # rubocop:disable Lint/AssignmentInCondition
+    # rubocop:disable Rails/SkipsModelValidations
+    if configured_service = ActiveStorage::Blob.service.name
+      ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
+    end
+    # rubocop:enable Lint/AssignmentInCondition
+    # rubocop:enable Rails/SkipsModelValidations
+    change_column :active_storage_blobs, :service_name, :string, null: false
+  end
+
+  def down
+    remove_column :active_storage_blobs, :service_name
+  end
+end
diff --git a/db/migrate/20240702145137_create_active_storage_variant_records.decidim.rb b/db/migrate/20240702145137_create_active_storage_variant_records.decidim.rb
new file mode 100644
index 00000000..7198feef
--- /dev/null
+++ b/db/migrate/20240702145137_create_active_storage_variant_records.decidim.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20210831181635)
+
+# This migration comes from active_storage (originally 20191206030411)
+class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
+  def change
+    create_table :active_storage_variant_records do |t|
+      t.belongs_to :blob, null: false, index: false
+      t.string :variation_digest, null: false
+
+      t.index [:blob_id, :variation_digest], name: "index_active_storage_variant_records_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end
diff --git a/db/migrate/20240702145138_create_decidim_reminders.decidim.rb b/db/migrate/20240702145138_create_decidim_reminders.decidim.rb
new file mode 100644
index 00000000..b77cff39
--- /dev/null
+++ b/db/migrate/20240702145138_create_decidim_reminders.decidim.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20211208155453)
+
+class CreateDecidimReminders < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_reminders do |t|
+      t.belongs_to :decidim_user, index: true, foreign_key: true, null: false
+      t.belongs_to :decidim_component, index: true, foreign_key: true
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20240702145139_create_decidim_reminder_records.decidim.rb b/db/migrate/20240702145139_create_decidim_reminder_records.decidim.rb
new file mode 100644
index 00000000..a70c9bdc
--- /dev/null
+++ b/db/migrate/20240702145139_create_decidim_reminder_records.decidim.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20211209121025)
+
+class CreateDecidimReminderRecords < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_reminder_records do |t|
+      t.string :state, :string, index: true, default: "active"
+      t.belongs_to :decidim_reminder, index: true, foreign_key: true
+      t.belongs_to :remindable, polymorphic: true, null: false, index: { name: "index_decidim_reminder_records_remindable" }
+    end
+  end
+end
diff --git a/db/migrate/20240702145140_create_decidim_reminder_deliveries.decidim.rb b/db/migrate/20240702145140_create_decidim_reminder_deliveries.decidim.rb
new file mode 100644
index 00000000..1b5a35d1
--- /dev/null
+++ b/db/migrate/20240702145140_create_decidim_reminder_deliveries.decidim.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20211209121040)
+
+class CreateDecidimReminderDeliveries < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_reminder_deliveries do |t|
+      t.belongs_to :decidim_reminder, index: true, foreign_key: true
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20240702145141_change_required_description_categories.decidim.rb b/db/migrate/20240702145141_change_required_description_categories.decidim.rb
new file mode 100644
index 00000000..95ccc493
--- /dev/null
+++ b/db/migrate/20240702145141_change_required_description_categories.decidim.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20220118121921)
+
+class ChangeRequiredDescriptionCategories < ActiveRecord::Migration[6.0]
+  def change
+    change_column_null :decidim_categories, :description, true
+  end
+end
diff --git a/db/migrate/20240702145142_add_notification_settings_to_users.decidim.rb b/db/migrate/20240702145142_add_notification_settings_to_users.decidim.rb
new file mode 100644
index 00000000..6072e143
--- /dev/null
+++ b/db/migrate/20240702145142_add_notification_settings_to_users.decidim.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20220127113419)
+
+class AddNotificationSettingsToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_users, :notification_settings, :jsonb, default: {}
+  end
+end
diff --git a/db/migrate/20240702145143_add_notifications_sending_frequency_to_users.decidim.rb b/db/migrate/20240702145143_add_notifications_sending_frequency_to_users.decidim.rb
new file mode 100644
index 00000000..f465c3d8
--- /dev/null
+++ b/db/migrate/20240702145143_add_notifications_sending_frequency_to_users.decidim.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20220203121137)
+
+class AddNotificationsSendingFrequencyToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_users, :notifications_sending_frequency, :string, default: "daily"
+    add_index :decidim_users, :notifications_sending_frequency
+  end
+end
diff --git a/db/migrate/20240702145144_add_digest_sent_at_to_users.decidim.rb b/db/migrate/20240702145144_add_digest_sent_at_to_users.decidim.rb
new file mode 100644
index 00000000..122e68fd
--- /dev/null
+++ b/db/migrate/20240702145144_add_digest_sent_at_to_users.decidim.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20220215172439)
+
+class AddDigestSentAtToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_users, :digest_sent_at, :datetime
+  end
+end
diff --git a/db/migrate/20240702145145_add_index_to_decidim_users_notifications_sending_frequency.decidim.rb b/db/migrate/20240702145145_add_index_to_decidim_users_notifications_sending_frequency.decidim.rb
new file mode 100644
index 00000000..7417dc65
--- /dev/null
+++ b/db/migrate/20240702145145_add_index_to_decidim_users_notifications_sending_frequency.decidim.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20220323195258)
+
+class AddIndexToDecidimUsersNotificationsSendingFrequency < ActiveRecord::Migration[6.0]
+  def change
+    add_index :decidim_users, :notifications_sending_frequency
+  end
+end
diff --git a/db/migrate/20240702145146_drop_emails_on_notifications_flag_from_user.decidim.rb b/db/migrate/20240702145146_drop_emails_on_notifications_flag_from_user.decidim.rb
new file mode 100644
index 00000000..1004f77b
--- /dev/null
+++ b/db/migrate/20240702145146_drop_emails_on_notifications_flag_from_user.decidim.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20220427142214)
+
+class DropEmailsOnNotificationsFlagFromUser < ActiveRecord::Migration[5.1]
+  class DecidimUser < ApplicationRecord
+    self.table_name = :decidim_users
+  end
+
+  def change
+    # rubocop:disable Rails/SkipsModelValidations
+    DecidimUser.where(email_on_notification: true).update_all(notifications_sending_frequency: "real_time")
+    # rubocop:enable Rails/SkipsModelValidations
+
+    remove_column :decidim_users, :email_on_notification
+  end
+end
diff --git a/db/migrate/20240702145147_add_previous_passwords_to_users.decidim.rb b/db/migrate/20240702145147_add_previous_passwords_to_users.decidim.rb
new file mode 100644
index 00000000..4b99434d
--- /dev/null
+++ b/db/migrate/20240702145147_add_previous_passwords_to_users.decidim.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20220518094535)
+
+class AddPreviousPasswordsToUsers < ActiveRecord::Migration[6.1]
+  class User < ApplicationRecord
+    self.table_name = :decidim_users
+  end
+
+  def change
+    add_column :decidim_users, :password_updated_at, :datetime
+    add_column :decidim_users, :previous_passwords, :string, array: true, default: []
+
+    reversible do |direction|
+      direction.up do
+        # rubocop:disable Rails/SkipsModelValidations
+        User.update_all("password_updated_at = updated_at")
+        # rubocop:enable Rails/SkipsModelValidations
+      end
+    end
+  end
+end
diff --git a/db/migrate/20240702145148_create_decidim_short_links.decidim.rb b/db/migrate/20240702145148_create_decidim_short_links.decidim.rb
new file mode 100644
index 00000000..b4a07a48
--- /dev/null
+++ b/db/migrate/20240702145148_create_decidim_short_links.decidim.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20220524195530)
+
+class CreateDecidimShortLinks < ActiveRecord::Migration[6.1]
+  def change
+    create_table :decidim_short_links do |t|
+      t.references :decidim_organization, null: false, index: true
+      t.references :target, polymorphic: true, null: false, index: true
+      t.string :identifier, limit: 10, null: false
+      t.string :mounted_engine_name, index: true
+      t.string :route_name, index: true
+      t.jsonb :params
+
+      t.timestamps
+    end
+
+    add_index(
+      :decidim_short_links,
+      [:decidim_organization_id, :identifier],
+      unique: true,
+      name: "idx_decidim_short_links_organization_id_identifier"
+    )
+  end
+end
diff --git a/db/migrate/20240702145149_change_default_value_for_decidim_endorsements.decidim.rb b/db/migrate/20240702145149_change_default_value_for_decidim_endorsements.decidim.rb
new file mode 100644
index 00000000..3069489f
--- /dev/null
+++ b/db/migrate/20240702145149_change_default_value_for_decidim_endorsements.decidim.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim (originally 20231027142329)
+
+class ChangeDefaultValueForDecidimEndorsements < ActiveRecord::Migration[6.1]
+  def up
+    change_column_default :decidim_endorsements, :decidim_user_group_id, 0
+  end
+
+  def down
+    change_column_default :decidim_endorsements, :decidim_user_group_id, nil
+  end
+end
diff --git a/db/migrate/20240702145150_create_decidim_participatory_process_types.decidim_participatory_processes.rb b/db/migrate/20240702145150_create_decidim_participatory_process_types.decidim_participatory_processes.rb
new file mode 100644
index 00000000..c8668d54
--- /dev/null
+++ b/db/migrate/20240702145150_create_decidim_participatory_process_types.decidim_participatory_processes.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim_participatory_processes (originally 20211125202008)
+
+class CreateDecidimParticipatoryProcessTypes < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_participatory_process_types do |t|
+      t.jsonb :title, null: false
+      t.references(
+        :decidim_organization,
+        foreign_key: true,
+        index: { name: "index_decidim_process_types_on_decidim_organization_id" }
+      )
+      t.timestamps
+    end
+
+    add_reference(
+      :decidim_participatory_processes,
+      :decidim_participatory_process_type,
+      foreign_key: true,
+      index: { name: "index_decidim_processes_on_decidim_process_type_id" }
+    )
+  end
+end
diff --git a/db/migrate/20240702145151_remove_not_null_on_customize_registration_email.decidim_meetings.rb b/db/migrate/20240702145151_remove_not_null_on_customize_registration_email.decidim_meetings.rb
new file mode 100644
index 00000000..956a1923
--- /dev/null
+++ b/db/migrate/20240702145151_remove_not_null_on_customize_registration_email.decidim_meetings.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim_meetings (originally 20211105115625)
+
+class RemoveNotNullOnCustomizeRegistrationEmail < ActiveRecord::Migration[6.0]
+  def change
+    change_column_null :decidim_meetings_meetings, :customize_registration_email, true
+  end
+end
diff --git a/db/migrate/20240702145152_add_geolocalization_fields_to_projects.decidim_budgets.rb b/db/migrate/20240702145152_add_geolocalization_fields_to_projects.decidim_budgets.rb
new file mode 100644
index 00000000..46f5d167
--- /dev/null
+++ b/db/migrate/20240702145152_add_geolocalization_fields_to_projects.decidim_budgets.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim_budgets (originally 20220428072638)
+
+class AddGeolocalizationFieldsToProjects < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_budgets_projects, :address, :text
+    add_column :decidim_budgets_projects, :latitude, :float
+    add_column :decidim_budgets_projects, :longitude, :float
+  end
+end
diff --git a/db/migrate/20240702145153_create_decidim_templates.decidim_templates.rb b/db/migrate/20240702145153_create_decidim_templates.decidim_templates.rb
new file mode 100644
index 00000000..39578192
--- /dev/null
+++ b/db/migrate/20240702145153_create_decidim_templates.decidim_templates.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim_templates (originally 20200518093819)
+
+class CreateDecidimTemplates < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_templates_templates do |t|
+      t.integer :decidim_organization_id, null: false, index: { name: "index_decidim_templates_organization" }
+      t.references :templatable, polymorphic: true, index: { name: "index_decidim_templates_templatable" }
+      t.jsonb :name, null: false
+      t.jsonb :description
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20240702145154_add_title_to_timeline_entries.decidim_accountability.rb b/db/migrate/20240702145154_add_title_to_timeline_entries.decidim_accountability.rb
new file mode 100644
index 00000000..d1009fdd
--- /dev/null
+++ b/db/migrate/20240702145154_add_title_to_timeline_entries.decidim_accountability.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim_accountability (originally 20220331150008)
+
+class AddTitleToTimelineEntries < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_accountability_timeline_entries, :title, :jsonb
+  end
+end
diff --git a/db/migrate/20240702145155_move_legacy_description_to_title_of_timeline_entries.decidim_accountability.rb b/db/migrate/20240702145155_move_legacy_description_to_title_of_timeline_entries.decidim_accountability.rb
new file mode 100644
index 00000000..b1c67a84
--- /dev/null
+++ b/db/migrate/20240702145155_move_legacy_description_to_title_of_timeline_entries.decidim_accountability.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim_accountability (originally 20220331150155)
+
+class MoveLegacyDescriptionToTitleOfTimelineEntries < ActiveRecord::Migration[6.1]
+  class TimelineEntry < ApplicationRecord
+    self.table_name = :decidim_accountability_timeline_entries
+  end
+
+  def up
+    TimelineEntry.find_each do |timeline_entry|
+      timeline_entry.update!(title: timeline_entry.description, description: nil)
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 48f42862..c5aad61d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2,15 +2,15 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_07_24_170913) do
+ActiveRecord::Schema.define(version: 2024_07_02_145155) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "ltree"
@@ -35,9 +35,16 @@
     t.bigint "byte_size", null: false
     t.string "checksum", null: false
     t.datetime "created_at", null: false
+    t.string "service_name", null: false
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
 
+  create_table "active_storage_variant_records", force: :cascade do |t|
+    t.bigint "blob_id", null: false
+    t.string "variation_digest", null: false
+    t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
+  end
+
   create_table "decidim_accountability_results", id: :serial, force: :cascade do |t|
     t.jsonb "title"
     t.jsonb "description"
@@ -79,6 +86,7 @@
     t.integer "decidim_accountability_result_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.jsonb "title"
     t.index ["decidim_accountability_result_id"], name: "index_decidim_accountability_timeline_entries_on_results_id"
     t.index ["entry_date"], name: "index_decidim_accountability_timeline_entries_on_entry_date"
   end
@@ -371,13 +379,13 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "reference"
-    t.string "address"
-    t.float "latitude"
-    t.float "longitude"
     t.bigint "decidim_budgets_budget_id"
     t.date "selected_at"
     t.integer "comments_count", default: 0, null: false
     t.integer "follows_count", default: 0, null: false
+    t.text "address"
+    t.float "latitude"
+    t.float "longitude"
     t.index ["decidim_budgets_budget_id"], name: "index_decidim_budgets_projects_on_decidim_budgets_budget_id"
     t.index ["decidim_scope_id"], name: "index_decidim_budgets_projects_on_decidim_scope_id"
   end
@@ -396,7 +404,7 @@
 
   create_table "decidim_categories", id: :serial, force: :cascade do |t|
     t.jsonb "name", null: false
-    t.jsonb "description", null: false
+    t.jsonb "description"
     t.integer "parent_id"
     t.integer "decidim_participatory_space_id"
     t.string "decidim_participatory_space_type"
@@ -571,7 +579,7 @@
     t.bigint "resource_id"
     t.string "decidim_author_type"
     t.bigint "decidim_author_id"
-    t.integer "decidim_user_group_id"
+    t.integer "decidim_user_group_id", default: 0
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["decidim_author_type", "decidim_author_id"], name: "idx_endorsements_authors"
@@ -814,7 +822,7 @@
     t.string "registration_type", default: "registration_disabled", null: false
     t.string "registration_url"
     t.integer "follows_count", default: 0, null: false
-    t.boolean "customize_registration_email", default: false, null: false
+    t.boolean "customize_registration_email", default: false
     t.jsonb "registration_email_custom_content"
     t.datetime "published_at"
     t.string "video_url"
@@ -1108,6 +1116,14 @@
     t.index ["position"], name: "index_order_by_position_for_steps"
   end
 
+  create_table "decidim_participatory_process_types", force: :cascade do |t|
+    t.jsonb "title", null: false
+    t.bigint "decidim_organization_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["decidim_organization_id"], name: "index_decidim_process_types_on_decidim_organization_id"
+  end
+
   create_table "decidim_participatory_process_user_roles", id: :serial, force: :cascade do |t|
     t.integer "decidim_user_id"
     t.integer "decidim_participatory_process_id"
@@ -1152,10 +1168,12 @@
     t.boolean "show_metrics", default: true
     t.integer "weight", default: 1, null: false
     t.integer "follows_count", default: 0, null: false
+    t.bigint "decidim_participatory_process_type_id"
     t.index ["decidim_area_id"], name: "index_decidim_participatory_processes_on_decidim_area_id"
     t.index ["decidim_organization_id", "slug"], name: "index_unique_process_slug_and_organization", unique: true
     t.index ["decidim_organization_id"], name: "index_decidim_processes_on_decidim_organization_id"
     t.index ["decidim_participatory_process_group_id"], name: "idx_process_on_process_group_id"
+    t.index ["decidim_participatory_process_type_id"], name: "index_decidim_processes_on_decidim_process_type_id"
     t.index ["decidim_scope_id"], name: "idx_process_on_scope_id"
     t.index ["decidim_scope_type_id"], name: "index_decidim_participatory_processes_on_decidim_scope_type_id"
   end
@@ -1298,6 +1316,34 @@
     t.index ["valuator_role_type", "valuator_role_id"], name: "decidim_proposals_valuation_assignment_valuator_role"
   end
 
+  create_table "decidim_reminder_deliveries", force: :cascade do |t|
+    t.bigint "decidim_reminder_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["decidim_reminder_id"], name: "index_decidim_reminder_deliveries_on_decidim_reminder_id"
+  end
+
+  create_table "decidim_reminder_records", force: :cascade do |t|
+    t.string "state", default: "active"
+    t.string "string", default: "active"
+    t.bigint "decidim_reminder_id"
+    t.string "remindable_type", null: false
+    t.bigint "remindable_id", null: false
+    t.index ["decidim_reminder_id"], name: "index_decidim_reminder_records_on_decidim_reminder_id"
+    t.index ["remindable_type", "remindable_id"], name: "index_decidim_reminder_records_remindable"
+    t.index ["state"], name: "index_decidim_reminder_records_on_state"
+    t.index ["string"], name: "index_decidim_reminder_records_on_string"
+  end
+
+  create_table "decidim_reminders", force: :cascade do |t|
+    t.bigint "decidim_user_id", null: false
+    t.bigint "decidim_component_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["decidim_component_id"], name: "index_decidim_reminders_on_decidim_component_id"
+    t.index ["decidim_user_id"], name: "index_decidim_reminders_on_decidim_user_id"
+  end
+
   create_table "decidim_reports", id: :serial, force: :cascade do |t|
     t.integer "decidim_moderation_id", null: false
     t.integer "decidim_user_id", null: false
@@ -1391,6 +1437,23 @@
     t.index ["token_for_type", "token_for_id"], name: "decidim_share_tokens_token_for"
   end
 
+  create_table "decidim_short_links", force: :cascade do |t|
+    t.bigint "decidim_organization_id", null: false
+    t.string "target_type", null: false
+    t.bigint "target_id", null: false
+    t.string "identifier", limit: 10, null: false
+    t.string "mounted_engine_name"
+    t.string "route_name"
+    t.jsonb "params"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["decidim_organization_id", "identifier"], name: "idx_decidim_short_links_organization_id_identifier", unique: true
+    t.index ["decidim_organization_id"], name: "index_decidim_short_links_on_decidim_organization_id"
+    t.index ["mounted_engine_name"], name: "index_decidim_short_links_on_mounted_engine_name"
+    t.index ["route_name"], name: "index_decidim_short_links_on_route_name"
+    t.index ["target_type", "target_id"], name: "index_decidim_short_links_on_target"
+  end
+
   create_table "decidim_sortitions_sortitions", force: :cascade do |t|
     t.bigint "decidim_component_id"
     t.integer "decidim_proposals_component_id"
@@ -1464,6 +1527,18 @@
     t.index ["reset_password_token"], name: "index_decidim_system_admins_on_reset_password_token", unique: true
   end
 
+  create_table "decidim_templates_templates", force: :cascade do |t|
+    t.integer "decidim_organization_id", null: false
+    t.string "templatable_type"
+    t.bigint "templatable_id"
+    t.jsonb "name", null: false
+    t.jsonb "description"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["decidim_organization_id"], name: "index_decidim_templates_organization"
+    t.index ["templatable_type", "templatable_id"], name: "index_decidim_templates_templatable"
+  end
+
   create_table "decidim_term_customizer_constraints", force: :cascade do |t|
     t.bigint "decidim_organization_id", null: false
     t.string "subject_type"
@@ -1559,7 +1634,6 @@
     t.boolean "admin", default: false, null: false
     t.boolean "managed", default: false, null: false
     t.string "roles", default: [], array: true
-    t.boolean "email_on_notification", default: false, null: false
     t.string "nickname", limit: 20, default: "", null: false
     t.string "personal_url"
     t.text "about"
@@ -1584,6 +1658,11 @@
     t.integer "block_id"
     t.boolean "email_on_moderations", default: true
     t.integer "follows_count", default: 0, null: false
+    t.jsonb "notification_settings", default: {}
+    t.string "notifications_sending_frequency", default: "daily"
+    t.datetime "digest_sent_at"
+    t.datetime "password_updated_at"
+    t.string "previous_passwords", default: [], array: true
     t.index ["confirmation_token"], name: "index_decidim_users_on_confirmation_token", unique: true
     t.index ["decidim_organization_id"], name: "index_decidim_users_on_decidim_organization_id"
     t.index ["email", "decidim_organization_id"], name: "index_decidim_users_on_email_and_decidim_organization_id", unique: true, where: "((deleted_at IS NULL) AND (managed = false) AND ((type)::text = 'Decidim::User'::text))"
@@ -1593,6 +1672,7 @@
     t.index ["invited_by_id", "invited_by_type"], name: "index_decidim_users_on_invited_by_id_and_invited_by_type"
     t.index ["invited_by_id"], name: "index_decidim_users_on_invited_by_id"
     t.index ["nickname", "decidim_organization_id"], name: "index_decidim_users_on_nickame_and_decidim_organization_id", unique: true, where: "((deleted_at IS NULL) AND (managed = false))"
+    t.index ["notifications_sending_frequency"], name: "index_decidim_users_on_notifications_sending_frequency"
     t.index ["officialized_at"], name: "index_decidim_users_on_officialized_at"
     t.index ["reset_password_token"], name: "index_decidim_users_on_reset_password_token", unique: true
     t.index ["unlock_token"], name: "index_decidim_users_on_unlock_token", unique: true
@@ -1690,6 +1770,7 @@
   end
 
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "decidim_area_types", "decidim_organizations"
   add_foreign_key "decidim_areas", "decidim_area_types", column: "area_type_id"
   add_foreign_key "decidim_areas", "decidim_organizations"
@@ -1711,8 +1792,14 @@
   add_foreign_key "decidim_identities", "decidim_organizations"
   add_foreign_key "decidim_newsletters", "decidim_users", column: "author_id"
   add_foreign_key "decidim_participatory_process_steps", "decidim_participatory_processes"
+  add_foreign_key "decidim_participatory_process_types", "decidim_organizations"
   add_foreign_key "decidim_participatory_processes", "decidim_organizations"
+  add_foreign_key "decidim_participatory_processes", "decidim_participatory_process_types"
   add_foreign_key "decidim_participatory_processes", "decidim_scope_types"
+  add_foreign_key "decidim_reminder_deliveries", "decidim_reminders"
+  add_foreign_key "decidim_reminder_records", "decidim_reminders"
+  add_foreign_key "decidim_reminders", "decidim_components"
+  add_foreign_key "decidim_reminders", "decidim_users"
   add_foreign_key "decidim_scope_types", "decidim_organizations"
   add_foreign_key "decidim_scopes", "decidim_organizations"
   add_foreign_key "decidim_scopes", "decidim_scope_types", column: "scope_type_id"
diff --git a/db/seeds.rb b/db/seeds.rb
index 7eb3125d..c87234bf 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -9,7 +9,7 @@
 #   Character.create(name: 'Luke', movie: movies.first)
 # You can remove the 'faker' gem if you don't want Decidim seeds.
 if ENV["HEROKU_APP_NAME"].present?
-  ENV["DECIDIM_HOST"] = "#{ENV["HEROKU_APP_NAME"]}.herokuapp.com"
+  ENV["DECIDIM_HOST"] = "#{ENV.fetch("HEROKU_APP_NAME", nil)}.herokuapp.com"
   ENV["SEED"] = "true"
 end
 Decidim.seed!
diff --git a/lib/decidim_app/k8s/commands/admin.rb b/lib/decidim_app/k8s/commands/admin.rb
index 2be5584a..affdc487 100644
--- a/lib/decidim_app/k8s/commands/admin.rb
+++ b/lib/decidim_app/k8s/commands/admin.rb
@@ -50,7 +50,6 @@ def admin_params
           @admin_params ||= {
             password_confirmation: @configuration[:password],
             tos_agreement: "1",
-            email_on_notification: existing_admin.email_on_notification || true,
             newsletter_notifications_at: existing_admin.confirmed_at || Time.zone.now,
             admin_terms_accepted_at: existing_admin.confirmed_at || Time.zone.now,
             confirmed_at: existing_admin.confirmed_at || Time.zone.now
diff --git a/lib/decidim_app/sentry_setup.rb b/lib/decidim_app/sentry_setup.rb
index a5f45376..1e89fb41 100644
--- a/lib/decidim_app/sentry_setup.rb
+++ b/lib/decidim_app/sentry_setup.rb
@@ -15,8 +15,8 @@ def init
         config.traces_sample_rate = sample_rate.to_f
       end
 
-      Sentry.set_tags('server.hostname': hostname) if hostname.present?
-      Sentry.set_tags('server.ip': ip) if ip.present?
+      Sentry.set_tags("server.hostname": hostname) if hostname.present?
+      Sentry.set_tags("server.ip": ip) if ip.present?
     end
 
     private
diff --git a/lib/omniauth/strategies/cdc_saml.rb b/lib/omniauth/strategies/cdc_saml.rb
index 33bd7650..3876afe3 100644
--- a/lib/omniauth/strategies/cdc_saml.rb
+++ b/lib/omniauth/strategies/cdc_saml.rb
@@ -24,7 +24,7 @@ class CDCSAML < OmniAuth::Strategies::SAML
           [key, attribute]
         end
 
-        hash_attributes = Hash[found_attributes]
+        hash_attributes = found_attributes.to_h
 
         hash_attributes["name"] = "#{hash_attributes["first_name"]} #{hash_attributes["last_name"]}"
 
diff --git a/lib/tasks/decidim_app.rake b/lib/tasks/decidim_app.rake
index a2a55077..c0d7ed68 100644
--- a/lib/tasks/decidim_app.rake
+++ b/lib/tasks/decidim_app.rake
@@ -53,7 +53,7 @@ namespace :decidim_app do
 
     desc "usage: bundle exec rails k8s:export_configuration IMAGE=<docker_image_ref>"
     task export_configuration: :environment do
-      image = ENV["IMAGE"]
+      image = ENV.fetch("IMAGE", nil)
       raise "You must specify a docker image, usage: bundle exec rails k8s:export_configuration IMAGE=<image_ref>" if image.blank?
 
       DecidimApp::K8s::ConfigurationExporter.export!(image)
@@ -61,9 +61,11 @@ namespace :decidim_app do
 
     desc "Create install or reload install with path='path/to/external_install_configuration.yml'"
     task external_install_or_reload: :environment do
-      raise "You must specify a path to an external install configuration, path='path/to/external_install_configuration.yml'" if ENV["path"].blank? || !File.exist?(ENV["path"])
+      raise "You must specify a path to an external install configuration, path='path/to/external_install_configuration.yml'" if ENV["path"].blank? || !File.exist?(ENV.fetch(
+                                                                                                                                                                      "path", nil
+                                                                                                                                                                    ))
 
-      DecidimApp::K8s::Manager.run(ENV["path"])
+      DecidimApp::K8s::Manager.run(ENV.fetch("path", nil))
     end
   end
 end
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index e9076551..e93a79d0 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -196,12 +196,12 @@ namespace :import do
                      Logger.new("log/import-user-#{Time.zone.now.strftime "%Y-%m-%d-%H:%M:%S"}.log")
                    end
 
-    display_help unless ENV["FILE"] && ENV["ORG"] && ENV["ADMIN"] && ENV["PROCESS"]
-    @file = ENV["FILE"]
+    display_help unless ENV.fetch("FILE", nil) && ENV.fetch("ORG", nil) && ENV.fetch("ADMIN", nil) && ENV.fetch("PROCESS", nil)
+    @file = ENV.fetch("FILE", nil)
     @org = ENV["ORG"].to_i
     @admin = ENV["ADMIN"].to_i
     @process = ENV["PROCESS"].to_i
-    @auth_handler = ENV["AUTH_HANDLER"]
+    @auth_handler = ENV.fetch("AUTH_HANDLER", nil)
 
     validate_input
 
diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake
index 047f4803..b54955a3 100644
--- a/lib/tasks/migrate.rake
+++ b/lib/tasks/migrate.rake
@@ -173,7 +173,7 @@ class MigrationsFixer
 
   # Build osp-app path and returns osp-app path ending with '/*'
   def osp_app_path
-    osp_app_path ||= File.expand_path(ENV["MIGRATIONS_PATH"])
+    osp_app_path ||= File.expand_path(ENV.fetch("MIGRATIONS_PATH", nil))
     if osp_app_path.end_with?("/")
       osp_app_path
     else
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 1b1a151f..66b65818 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
+require "spec_helper"
 require "i18n/tasks"
 
 describe "I18n sanity" do
   let(:locales) do
-    ENV["ENFORCED_LOCALES"].presence || "en,fr"
+    ENV["ENFORCED_LOCALES"].presence || Decidim.available_locales.map(&:to_s).join(",")
   end
 
   let(:i18n) { I18n::Tasks::BaseTask.new(locales: locales.split(",")) }
   let(:missing_keys) { i18n.missing_keys }
   let(:unused_keys) { i18n.unused_keys }
   let(:non_normalized_paths) { i18n.non_normalized_paths }
+  let(:inconsistent_interpolations) { i18n.inconsistent_interpolations }
 
   it "does not have missing keys" do
     expect(missing_keys).to be_empty, "#{missing_keys.inspect} are missing"
@@ -29,4 +31,10 @@
       expect(non_normalized_paths).to be_empty, error_message
     end
   end
+
+  it "does not have inconsistent interpolations" do
+    error_message = "#{inconsistent_interpolations.leaves.count} i18n keys have inconsistent interpolations.\n" \
+                    "Run `i18n-tasks check-consistent-interpolations' to show them"
+    expect(inconsistent_interpolations).to be_empty, error_message
+  end
 end
diff --git a/spec/lib/active_storage/migrator_spec.rb b/spec/lib/active_storage/migrator_spec.rb
index fe1d7a35..006cabce 100644
--- a/spec/lib/active_storage/migrator_spec.rb
+++ b/spec/lib/active_storage/migrator_spec.rb
@@ -54,7 +54,7 @@
 
   describe ".migrate!" do
     it "creates a new instance and calls #migrate!" do
-      expect(described_class).to receive(:new).with(source, destination).and_return(subject)
+      allow(described_class).to receive(:new).with(source, destination).and_return(subject)
       # rubocop:disable RSpec/SubjectStub
       expect(subject).to receive(:migrate!)
       # rubocop:enable RSpec/SubjectStub
@@ -71,7 +71,7 @@
     end
 
     it "migrates the blobs" do
-      expect(blob).to receive(:open).and_yield(Tempfile.new("blob"))
+      allow(blob).to receive(:open).and_yield(Tempfile.new("blob"))
       expect(subject.instance_variable_get(:@destination_service)).to receive(:upload).with(blob.key, anything, checksum: blob.checksum)
 
       subject.migrate!
diff --git a/spec/lib/decidim_app/k8s/commands/admin_spec.rb b/spec/lib/decidim_app/k8s/commands/admin_spec.rb
index 4b32edf4..f3488db1 100644
--- a/spec/lib/decidim_app/k8s/commands/admin_spec.rb
+++ b/spec/lib/decidim_app/k8s/commands/admin_spec.rb
@@ -40,10 +40,7 @@
 
   describe ".run" do
     it "runs the installation" do
-      # rubocop:disable RSpec/AnyInstance
-      expect_any_instance_of(described_class).to receive(:run).once
-      # rubocop:enable RSpec/AnyInstance
-
+      expect(described_class).to receive(:run).once
       described_class.run(default_admin_configuration, organization)
     end
   end
diff --git a/spec/lib/decidim_app/k8s/commands/organization_spec.rb b/spec/lib/decidim_app/k8s/commands/organization_spec.rb
index f702ac79..85d0e796 100644
--- a/spec/lib/decidim_app/k8s/commands/organization_spec.rb
+++ b/spec/lib/decidim_app/k8s/commands/organization_spec.rb
@@ -131,7 +131,7 @@
         expect(smtp_settings["address"]).to eq("address.smtp.org")
         expect(smtp_settings["port"]).to eq(8080)
         expect(smtp_settings["authentication"]).to eq("plain")
-        expect(smtp_settings["enable_starttls_auto"]).to eq(true)
+        expect(smtp_settings["enable_starttls_auto"]).to be(true)
         expect(Decidim::AttributeEncryptor.decrypt(smtp_settings["encrypted_password"])).to eq("password")
 
         omniauth_settings = organization.reload.omniauth_settings
@@ -139,7 +139,7 @@
         expect(Decidim::AttributeEncryptor.decrypt(omniauth_settings["omniauth_settings_publik_client_id"])).to eq("12345")
         expect(Decidim::AttributeEncryptor.decrypt(omniauth_settings["omniauth_settings_publik_client_secret"])).to eq("12345")
         expect(Decidim::AttributeEncryptor.decrypt(omniauth_settings["omniauth_settings_publik_site_url"])).to eq("https://example.com/")
-        expect(omniauth_settings["omniauth_settings_publik_enabled"]).to eq(true)
+        expect(omniauth_settings["omniauth_settings_publik_enabled"]).to be(true)
       end
 
       context "when organization is invalid" do
@@ -154,10 +154,7 @@
 
   describe ".run" do
     it "creates the organization" do
-      # rubocop:disable RSpec/AnyInstance
-      expect_any_instance_of(described_class).to receive(:run).once
-      # rubocop:enable RSpec/AnyInstance
-
+      expect(described_class).to receive(:run).once
       described_class.run(organization_configuration, default_admin_configuration)
     end
   end
diff --git a/spec/lib/decidim_app/k8s/commands/system_admin_spec.rb b/spec/lib/decidim_app/k8s/commands/system_admin_spec.rb
index defc46a1..27058ffa 100644
--- a/spec/lib/decidim_app/k8s/commands/system_admin_spec.rb
+++ b/spec/lib/decidim_app/k8s/commands/system_admin_spec.rb
@@ -44,10 +44,7 @@
 
   describe ".run" do
     it "runs the installation" do
-      # rubocop:disable RSpec/AnyInstance
-      expect_any_instance_of(described_class).to receive(:run).once
-      # rubocop:enable RSpec/AnyInstance
-
+      expect(described_class).to receive(:run).once
       described_class.run(default_system_admin_configuration)
     end
   end
diff --git a/spec/lib/decidim_app/k8s/configuration_exporter_spec.rb b/spec/lib/decidim_app/k8s/configuration_exporter_spec.rb
index a38e0752..3bd05a30 100644
--- a/spec/lib/decidim_app/k8s/configuration_exporter_spec.rb
+++ b/spec/lib/decidim_app/k8s/configuration_exporter_spec.rb
@@ -21,7 +21,7 @@
 
   describe "#export!" do
     it "exports the organizations" do
-      expect(DecidimApp::K8s::OrganizationExporter).to receive(:export!).with(organization, subject.instance_variable_get(:@logger), described_class::EXPORT_PATH, image).and_return(true)
+      allow(DecidimApp::K8s::OrganizationExporter).to receive(:export!).with(organization, subject.instance_variable_get(:@logger), described_class::EXPORT_PATH, image).and_return(true)
 
       subject.export!
     end
@@ -29,7 +29,7 @@
 
   describe "#dump_db!" do
     it "exports the organizations" do
-      expect(DecidimApp::K8s::OrganizationExporter).to receive(:dumping_database).with(organization, subject.instance_variable_get(:@logger), described_class::EXPORT_PATH).and_return(true)
+      allow(DecidimApp::K8s::OrganizationExporter).to receive(:dumping_database).with(organization, subject.instance_variable_get(:@logger), described_class::EXPORT_PATH).and_return(true)
 
       subject.dump_db
     end
@@ -37,20 +37,14 @@
 
   describe ".export!" do
     it "creates a new instance and calls export!" do
-      # rubocop:disable RSpec/AnyInstance
-      expect_any_instance_of(described_class).to receive(:export!)
-      # rubocop:enable RSpec/AnyInstance
-
+      expect(described_class).to receive(:export!)
       described_class.export!(image)
     end
   end
 
   describe ".dump_db" do
     it "creates a new instance and calls dumping_database!" do
-      # rubocop:disable RSpec/AnyInstance
-      expect_any_instance_of(described_class).to receive(:dump_db)
-      # rubocop:enable RSpec/AnyInstance
-
+      expect(described_class).to receive(:dump_db)
       described_class.dump_db
     end
   end
diff --git a/spec/lib/decidim_app/k8s/manager_spec.rb b/spec/lib/decidim_app/k8s/manager_spec.rb
index a6f87f53..c3666871 100644
--- a/spec/lib/decidim_app/k8s/manager_spec.rb
+++ b/spec/lib/decidim_app/k8s/manager_spec.rb
@@ -22,9 +22,7 @@
     context "when configuration is invalid" do
       before do
         allow(YAML).to receive(:load_file).and_return({})
-        # rubocop:disable RSpec/AnyInstance
-        allow_any_instance_of(DecidimApp::K8s::Configuration).to receive(:valid?).and_return(false)
-        # rubocop:enable RSpec/AnyInstance
+        allow(DecidimApp::K8s::Configuration).to receive(:valid?).and_return(false)
       end
 
       it "raises runtime error" do
@@ -35,10 +33,7 @@
 
   describe ".run" do
     it "runs the installation" do
-      # rubocop:disable RSpec/AnyInstance
-      expect_any_instance_of(described_class).to receive(:run).once
-      # rubocop:enable RSpec/AnyInstance
-
+      expect(described_class).to receive(:run).once
       described_class.run("spec/fixtures/k8s_configuration_example.yml")
     end
   end
diff --git a/spec/lib/decidim_app/k8s/organization_exporter_spec.rb b/spec/lib/decidim_app/k8s/organization_exporter_spec.rb
index be2b933c..739ed590 100644
--- a/spec/lib/decidim_app/k8s/organization_exporter_spec.rb
+++ b/spec/lib/decidim_app/k8s/organization_exporter_spec.rb
@@ -22,7 +22,7 @@
     }
   end
 
-  let(:database_name) { Rails.configuration.database_configuration[Rails.env]["database"] }
+  let(:database_configuration) { Rails.configuration.database_configuration[Rails.env].deep_symbolize_keys }
 
   before do
     organization.update!(secondary_hosts: [organization_secondary_host])
@@ -32,10 +32,8 @@
 
   describe ".export!" do
     it "calls the right methods" do
-      # rubocop:disable RSpec/AnyInstance
-      expect_any_instance_of(described_class).to receive(:export!)
+      expect(described_class).to receive(:export!)
       described_class.export!(organization, logger, export_path, image)
-      # rubocop:enable RSpec/AnyInstance
     end
   end
 
@@ -53,7 +51,16 @@
   describe "#dumping_database" do
     it "dumps the database" do
       # rubocop:disable RSpec/SubjectStub
-      expect(subject).to receive(:system).with("pg_dump -Fc #{database_name} > #{export_path}/#{name_space}--#{hostname}/postgres/#{hostname}--de.dump")
+
+      cmd = "pg_dump -Fc"
+      cmd += " -h '#{database_configuration[:host]}'" if database_configuration[:host].present?
+      cmd += " -p '#{database_configuration[:port]}'" if database_configuration[:port].present?
+      cmd += " -U '#{database_configuration[:username]}'" if database_configuration[:username].present?
+      cmd = "PGPASSWORD=#{database_configuration[:password]} #{cmd}" if database_configuration[:password].present?
+      cmd += " -d '#{database_configuration[:database]}'" if database_configuration[:database].present?
+      cmd += " -f #{export_path}/#{name_space}--#{hostname}/postgres/#{hostname}--de.dump"
+
+      expect(subject).to receive(:system).with(cmd)
       # rubocop:enable RSpec/SubjectStub
       subject.dumping_database
     end
@@ -167,7 +174,7 @@
     it "returns the organization columns" do
       expect(subject.organization_columns).to eq({
                                                    "available_authorizations" => [],
-                                                   "available_locales" => Decidim.available_locales.map(&:to_s),
+                                                   "available_locales" => %w(en fr),
                                                    "default_locale" => "en",
                                                    "file_upload_settings" => {
                                                      "allowed_content_types" => {
@@ -177,10 +184,11 @@
                                                      "allowed_file_extensions" => {
                                                        "admin" => %w(jpg jpeg gif png bmp pdf doc docx xls xlsx ppt pptx ppx rtf txt odt ott odf otg ods ots),
                                                        "default" => %w(jpg jpeg gif png bmp pdf rtf txt),
-                                                       "image" => %w(jpg jpeg gif png bmp ico)
+                                                       "favicon" => %w(png),
+                                                       "image" => %w(jpg jpeg gif png bmp)
                                                      },
                                                      "maximum_file_size" => {
-                                                       "avatar" => 5, "default" => 10
+                                                       "avatar" => 5.0, "default" => 10.0
                                                      }
                                                    },
                                                    "force_users_to_authenticate_before_access_organization" => false,
diff --git a/spec/lib/decidim_app/k8s/secondary_hosts_checker_spec.rb b/spec/lib/decidim_app/k8s/secondary_hosts_checker_spec.rb
index 4e2424bb..90f4b5e5 100644
--- a/spec/lib/decidim_app/k8s/secondary_hosts_checker_spec.rb
+++ b/spec/lib/decidim_app/k8s/secondary_hosts_checker_spec.rb
@@ -48,7 +48,7 @@
     context "when the host is not valid" do
       context "when it is not a valid url" do
         it "returns nil" do
-          expect(subject.get_redirection_target(123)).to eq(nil)
+          expect(subject.get_redirection_target(123)).to be_nil
         end
       end
 
@@ -57,7 +57,7 @@
         let(:response_code) { 404 }
 
         it "returns nil" do
-          expect(subject.get_redirection_target("nothing.org")).to eq(nil)
+          expect(subject.get_redirection_target("nothing.org")).to be_nil
         end
       end
     end
@@ -67,7 +67,7 @@
       let(:response_headers) { { "location" => "another_redirection.org" } }
 
       it "returns nil" do
-        expect(subject.get_redirection_target("redirection.org", 1)).to eq(nil)
+        expect(subject.get_redirection_target("redirection.org", 1)).to be_nil
       end
     end
 
@@ -75,7 +75,7 @@
       [Errno::ECONNREFUSED, SocketError, Errno::EHOSTUNREACH].each do |error|
         it "returns nil" do
           stub_request(:get, target).to_raise(error)
-          expect(subject.get_redirection_target(secondary_hosts.first)).to eq(nil)
+          expect(subject.get_redirection_target(secondary_hosts.first)).to be_nil
         end
       end
     end
@@ -83,7 +83,7 @@
 
   describe ".valid_secondary_host?" do
     it "returns true if the host is valid" do
-      expect(subject.valid_secondary_host?(host, secondary_hosts.first)).to eq(true)
+      expect(subject.valid_secondary_host?(host, secondary_hosts.first)).to be(true)
     end
 
     context "when host is not valid" do
@@ -91,7 +91,7 @@
       let(:response_code) { 404 }
 
       it "returns false" do
-        expect(subject.valid_secondary_host?(host, "nothing.org")).to eq(false)
+        expect(subject.valid_secondary_host?(host, "nothing.org")).to be(false)
       end
     end
   end
diff --git a/spec/lib/decidim_app/sentry_setup_spec.rb b/spec/lib/decidim_app/sentry_setup_spec.rb
index b8b17b81..93a23c04 100644
--- a/spec/lib/decidim_app/sentry_setup_spec.rb
+++ b/spec/lib/decidim_app/sentry_setup_spec.rb
@@ -16,9 +16,9 @@
 
   let(:server_metadata) do
     JSON.dump({
-                "hostname": "my_hostname",
-                "public_ip": {
-                  "address": "123.123.123.123"
+                hostname: "my_hostname",
+                public_ip: {
+                  address: "123.123.123.123"
                 }
               })
   end
diff --git a/spec/lib/rspec_runner_spec.rb b/spec/lib/rspec_runner_spec.rb
index 2fccc6ef..d489b872 100644
--- a/spec/lib/rspec_runner_spec.rb
+++ b/spec/lib/rspec_runner_spec.rb
@@ -21,7 +21,7 @@ module Decidim
       end
 
       it "executes the rspec command on the correct files" do
-        expect(subject.run).to eq(nil)
+        expect(subject.run).to be_nil
       end
     end
 
diff --git a/spec/lib/tasks/decidim_app/k8s/dump_db_tasks_spec.rb b/spec/lib/tasks/decidim_app/k8s/dump_db_tasks_spec.rb
index d4a47338..b62a6120 100644
--- a/spec/lib/tasks/decidim_app/k8s/dump_db_tasks_spec.rb
+++ b/spec/lib/tasks/decidim_app/k8s/dump_db_tasks_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "invokes the configuration exporter" do
-    expect(DecidimApp::K8s::ConfigurationExporter).to receive(:dump_db).and_return(true)
+    allow(DecidimApp::K8s::ConfigurationExporter).to receive(:dump_db).and_return(true)
 
     task.execute
   end
diff --git a/spec/lib/tasks/decidim_app/k8s/export_configuration_tasks_spec.rb b/spec/lib/tasks/decidim_app/k8s/export_configuration_tasks_spec.rb
index 02126459..c4012f6d 100644
--- a/spec/lib/tasks/decidim_app/k8s/export_configuration_tasks_spec.rb
+++ b/spec/lib/tasks/decidim_app/k8s/export_configuration_tasks_spec.rb
@@ -11,7 +11,7 @@
 
   it "invokes the configuration exporter" do
     with_modified_env IMAGE: image do
-      expect(DecidimApp::K8s::ConfigurationExporter).to receive(:export!).with(image).and_return(true)
+      expect(DecidimApp::K8s::ConfigurationExporter).to receive(:export!).with(image).at_least(:once).and_return(true)
 
       task.execute
     end
diff --git a/spec/lib/tasks/decidim_app/k8s/upgrade_task_spec.rb b/spec/lib/tasks/decidim_app/k8s/upgrade_task_spec.rb
index 6489f678..c1bbd512 100644
--- a/spec/lib/tasks/decidim_app/k8s/upgrade_task_spec.rb
+++ b/spec/lib/tasks/decidim_app/k8s/upgrade_task_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "calls db:migrate" do
-    expect(Rake::Task["db:migrate"]).to receive(:invoke)
+    expect(Rake::Task["db:migrate"]).to receive(:invoke).at_least(:once)
 
     task.execute
   end
diff --git a/spec/lib/tasks/scaleway/storage/migrate_from_local_task_spec.rb b/spec/lib/tasks/scaleway/storage/migrate_from_local_task_spec.rb
index 786b7f5f..480fc2b1 100644
--- a/spec/lib/tasks/scaleway/storage/migrate_from_local_task_spec.rb
+++ b/spec/lib/tasks/scaleway/storage/migrate_from_local_task_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it "invokes the migrator" do
-    expect(ActiveStorage::Migrator).to receive(:migrate!).with(:local, :scaleway).and_return(true)
+    expect(ActiveStorage::Migrator).to receive(:migrate!).with(:local, :scaleway).at_least(:once).and_return(true)
 
     task.execute
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0085ce11..bf45cd98 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,13 +6,31 @@
 
 Dir.glob("./spec/support/**/*.rb").sort.each { |f| require f }
 
+Capybara.register_driver :headless_chrome do |app|
+  options = ::Selenium::WebDriver::Chrome::Options.new
+  options.args << "--headless=new"
+  options.args << "--no-sandbox"
+  options.args << if ENV["BIG_SCREEN_SIZE"].present?
+                    "--window-size=1920,3000"
+                  else
+                    "--window-size=1920,1080"
+                  end
+  options.args << "--ignore-certificate-errors" if ENV["TEST_SSL"]
+  options.add_preference("intl.accept_languages", "en-GB")
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :chrome,
+    capabilities: [options]
+  )
+end
+
 RSpec.configure do |config|
   config.formatter = ENV.fetch("RSPEC_FORMAT", "progress").to_sym
   config.include EnvironmentVariablesHelper
+  config.include SkipIfUndefinedHelper
 
   config.before do
     # Initializers configs
-    Decidim.enable_html_header_snippets = false
     SocialShareButton.configure do |social_share_button|
       social_share_button.allow_sites = %w(twitter facebook whatsapp_app whatsapp_web telegram)
     end
diff --git a/spec/support/skip_if_undefined_helper.rb b/spec/support/skip_if_undefined_helper.rb
new file mode 100644
index 00000000..adc421ff
--- /dev/null
+++ b/spec/support/skip_if_undefined_helper.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module SkipIfUndefinedHelper
+  # Skips a test if a given class is undefined (i.e. : from another gem)
+  def skip_if_undefined(klass, gem)
+    skip "'#{gem}' gem is not present" unless klass.safe_constantize
+  end
+end
diff --git a/spec/system/account_spec.rb b/spec/system/account_spec.rb
index ce38166c..c0b6888a 100644
--- a/spec/system/account_spec.rb
+++ b/spec/system/account_spec.rb
@@ -33,7 +33,7 @@
 
     describe "update avatar" do
       it "can update avatar" do
-        attach_file :user_avatar, Decidim::Dev.asset("avatar.jpg")
+        dynamically_attach_file(:user_avatar, Decidim::Dev.asset("avatar.jpg"), remove_before: true)
 
         within "form.edit_user" do
           find("*[type=submit]").click
@@ -43,20 +43,43 @@
       end
 
       it "shows error when image is too big" do
-        attach_file :user_avatar, Decidim::Dev.asset("5000x5000.png")
+        find("#user_avatar_button").click
 
-        within "form.edit_user" do
-          find("*[type=submit]").click
+        within ".upload-modal" do
+          find(".remove-upload-item").click
+          input_element = find("input[type='file']", visible: :all)
+          input_element.attach_file(Decidim::Dev.asset("5000x5000.png"))
+
+          expect(page).to have_content("File resolution is too large", count: 1)
+          expect(page).to have_css(".upload-errors .form-error", count: 1)
         end
+      end
+    end
+
+    describe "update locales" do
+      context "when the organization has one locale" do
+        let(:organization) { create(:organization, available_locales: ["en"]) }
 
-        expect(page).to have_content("The image is too big", count: 1)
-        expect(page).to have_css(".flash.alert")
+        it "is not possible to change locales, #user_locale is disabled" do
+          expect(page).to have_css("#user_locale", text: "English")
+          expect(find("#user_locale")).to be_disabled
+        end
+      end
+
+      context "when the organization has more than one locale" do
+        it "shows the list of locales" do
+          find("#user_locale").click
+          expect(page).to have_css("option", count: organization.available_locales.size)
+        end
       end
     end
 
     describe "updating personal data" do
+      let!(:encrypted_password) { user.encrypted_password }
+
       it "updates the user's data" do
         within "form.edit_user" do
+          select "Français", from: :user_locale
           fill_in :user_name, with: "Nikola Tesla"
           fill_in :user_personal_url, with: "https://example.org"
           fill_in :user_about, with: "A Serbian-American inventor, electrical engineer, mechanical engineer, physicist, and futurist."
@@ -74,11 +97,35 @@
         user.reload
 
         within_user_menu do
-          find("a", text: "public profile").click
+          find("a", text: "Mon profil public").click
         end
 
         expect(page).to have_content("example.org")
         expect(page).to have_content("Serbian-American")
+
+        # The user's password should not change when they did not update it
+        expect(user.reload.encrypted_password).to eq(encrypted_password)
+      end
+    end
+
+    describe "updating locale" do
+      context "when the organization has more than one locale" do
+        it "switches the locale to french" do
+          within "form.edit_user" do
+            find("#user_locale").click
+            find("option", text: "Français").select_option
+            find("*[type=submit]").click
+          end
+
+          within_flash_messages do
+            expect(page).to have_content("successfully")
+          end
+
+          within "#user_locale" do
+            expect(page).to have_content("Français")
+          end
+          expect(page).to have_css(".help-text")
+        end
       end
     end
 
@@ -98,7 +145,7 @@
             expect(page).to have_content("successfully")
           end
 
-          expect(user.reload.valid_password?("sekritpass123")).to eq(true)
+          expect(user.reload.valid_password?("sekritpass123")).to be(true)
         end
       end
 
@@ -117,22 +164,58 @@
             expect(page).to have_content("There was a problem")
           end
 
-          expect(user.reload.valid_password?("sekritpass123")).to eq(false)
+          expect(user.reload.valid_password?("sekritpass123")).to be(false)
         end
       end
+    end
 
-      context "when updating the email" do
-        it "needs to confirm it" do
-          within "form.edit_user" do
-            fill_in :user_email, with: "foo@bar.com"
+    context "when updating the email" do
+      let(:pending_email) { "foo@bar.com" }
 
-            find("*[type=submit]").click
-          end
+      before do
+        within "form.edit_user" do
+          fill_in :user_email, with: pending_email
 
-          within_flash_messages do
-            expect(page).to have_content("email to confirm")
-          end
+          perform_enqueued_jobs { find("*[type=submit]").click }
         end
+
+        within_flash_messages do
+          expect(page).to have_content("You'll receive an email to confirm your new email address")
+        end
+      end
+
+      after do
+        clear_enqueued_jobs
+      end
+
+      it "tells user to confirm new email" do
+        expect(page).to have_content("Email change verification")
+        expect(page).to have_selector("#user_email[disabled='disabled']")
+        expect(page).to have_content("We have sent an email to #{pending_email} to verify your new email address")
+      end
+
+      it "resend confirmation" do
+        within "#email-change-pending" do
+          click_link "Send again"
+        end
+        expect(page).to have_content("Confirmation email resent successfully to #{pending_email}")
+        perform_enqueued_jobs
+        perform_enqueued_jobs
+
+        expect(emails.count).to eq(2)
+        visit last_email_link
+        expect(page).to have_content("Your email address has been successfully confirmed")
+      end
+
+      it "cancels the email change" do
+        expect(Decidim::User.find(user.id).unconfirmed_email).to eq(pending_email)
+        within "#email-change-pending" do
+          click_link "cancel"
+        end
+
+        expect(page).to have_content("Email change cancelled successfully")
+        expect(page).not_to have_content("Email change verification")
+        expect(Decidim::User.find(user.id).unconfirmed_email).to be_nil
       end
     end
 
@@ -154,6 +237,33 @@
           expect(page).to have_content("successfully")
         end
       end
+
+      context "when the user is an admin" do
+        let!(:user) { create(:user, :confirmed, :admin, password: password, password_confirmation: password) }
+
+        before do
+          login_as user, scope: :user
+          visit decidim.notifications_settings_path
+        end
+
+        it "updates the administrator's notifications" do
+          within ".switch.email_on_moderations" do
+            page.find(".switch-paddle").click
+          end
+
+          within ".switch.notification_settings" do
+            page.find(".switch-paddle").click
+          end
+
+          within "form.edit_user" do
+            find("*[type=submit]").click
+          end
+
+          within_flash_messages do
+            expect(page).to have_content("successfully")
+          end
+        end
+      end
     end
 
     context "when on the interests page" do
@@ -192,34 +302,5 @@
         end
       end
     end
-
-    context "when on the delete my account page" do
-      before do
-        visit decidim.delete_account_path
-      end
-
-      it "the user can delete his account" do
-        fill_in :delete_user_delete_account_delete_reason, with: "I just want to delete my account"
-
-        click_button "Delete my account"
-
-        click_button "Yes, I want to delete my account"
-
-        within_flash_messages do
-          expect(page).to have_content("successfully")
-        end
-
-        find(".sign-in-link").click
-
-        within ".new_user" do
-          fill_in :session_user_email, with: user.email
-          fill_in :session_user_password, with: password
-          find("*[type=submit]").click
-        end
-
-        expect(page).to have_no_content("Signed in successfully")
-        expect(page).to have_no_content(user.name)
-      end
-    end
   end
 end
diff --git a/spec/system/authentication_spec.rb b/spec/system/authentication_spec.rb
index 855a63f8..5ed7abc2 100644
--- a/spec/system/authentication_spec.rb
+++ b/spec/system/authentication_spec.rb
@@ -34,7 +34,7 @@
     context "when using another langage" do
       before do
         within_language_menu do
-          click_link "Castellano"
+          click_link "Français"
         end
       end
 
@@ -52,8 +52,8 @@
           find("*[type=submit]").click
         end
 
-        expect(page).to have_content("Se ha enviado un mensaje con un enlace de confirmación")
-        expect(last_user.locale).to eq("es")
+        expect(page).to have_content("lien de confirmation")
+        expect(last_user.locale).to eq("fr")
       end
     end
 
@@ -73,6 +73,7 @@
           find("*[type=submit]").click
         end
 
+        expect(page).not_to have_content("confirmation link")
         expect(page).not_to have_content("You have signed up successfully")
       end
     end
@@ -104,7 +105,7 @@
   end
 
   context "when confirming the account" do
-    let!(:user) { create(:user, email_on_notification: true, organization: organization) }
+    let!(:user) { create(:user, organization: organization) }
 
     before do
       perform_enqueued_jobs { user.confirm }
@@ -216,14 +217,33 @@
         expect(page).to have_content("10 characters minimum")
         expect(page).to have_content("must be different from your nickname and your email")
         expect(page).to have_content("must not be too common")
-        expect(page).to have_current_path "/users/password"
+        expect(page).to have_current_path %r{/users/password}
+      end
+
+      it "enforces the minimum length for the password in the front-end" do
+        visit last_email_link
+
+        within ".new_user" do
+          fill_in :password_user_password, with: "example"
+          fill_in :password_user_password_confirmation, with: "example"
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_content("The password is too short.")
+        expect(page).to have_content("Password confirmation must match the password.")
       end
     end
 
     describe "Sign Out" do
       before do
-        login_as user, scope: :user
-        visit decidim.root_path
+        ### MANUAL SIGN IN TO FIX ISSUE WITH METHOD `login_as` ###
+        find(".sign-in-link").click
+
+        within ".new_user" do
+          fill_in :session_user_email, with: user.email
+          fill_in :session_user_password, with: "DfyvHn425mYAy2HL"
+          find("*[type=submit]").click
+        end
       end
 
       it "signs out the user" do
@@ -354,7 +374,7 @@
             find("*[type=submit]").click
           end
 
-          expect(page).to have_content("A message with a confirmation link has been sent to your email address. Please follow the link to activate your account.")
+          expect(page).to have_content("confirmation link")
         end
       end
     end
diff --git a/spec/system/homepage_spec.rb b/spec/system/homepage_spec.rb
index f1141b76..7b1824d9 100644
--- a/spec/system/homepage_spec.rb
+++ b/spec/system/homepage_spec.rb
@@ -16,7 +16,16 @@
 
   context "when there's an organization" do
     let(:official_url) { "http://mytesturl.me" }
-    let(:organization) { create(:organization, official_url: official_url) }
+    let(:organization) do
+      create(:organization, official_url: official_url,
+                            highlighted_content_banner_enabled: true,
+                            highlighted_content_banner_title: Decidim::Faker::Localized.sentence(word_count: 2),
+                            highlighted_content_banner_short_description: Decidim::Faker::Localized.sentence(word_count: 2),
+                            highlighted_content_banner_action_title: Decidim::Faker::Localized.sentence(word_count: 2),
+                            highlighted_content_banner_action_subtitle: Decidim::Faker::Localized.sentence(word_count: 2),
+                            highlighted_content_banner_action_url: ::Faker::Internet.url,
+                            highlighted_content_banner_image: Decidim::Dev.test_file("city.jpeg", "image/jpeg"))
+    end
 
     before do
       create :content_block, organization: organization, scope_name: :homepage, manifest_name: :hero
@@ -39,7 +48,6 @@
 
       it "includes the official organization links and images" do
         expect(page).to have_selector("a.logo-cityhall[href='#{official_url}']")
-        expect(page).to have_selector("a.main-footer__badge[href='#{official_url}']")
       end
 
       context "and the organization has the omnipresent banner enabled" do
@@ -122,19 +130,8 @@
         let(:snippet) { "<meta data-hello=\"This is the organization header_snippet field\">" }
         let(:organization) { create(:organization, official_url: official_url, header_snippets: snippet) }
 
-        it "does not include the header snippets" do
-          expect(page).not_to have_selector("meta[data-hello]", visible: :all)
-        end
-
-        context "when header snippets are enabled" do
-          before do
-            allow(Decidim).to receive(:enable_html_header_snippets).and_return(true)
-            visit decidim.root_path
-          end
-
-          it "includes the header snippets" do
-            expect(page).to have_selector("meta[data-hello]", visible: :all)
-          end
+        it "includes the header snippets" do
+          expect(page).to have_selector("meta[data-hello]", visible: :all)
         end
       end
 
@@ -173,6 +170,73 @@
             expect(page).to have_content(organization.name)
           end
         end
+
+        context "when organization forces users to authenticate before access" do
+          let(:organization) do
+            create(
+              :organization,
+              official_url: official_url,
+              force_users_to_authenticate_before_access_organization: true
+            )
+          end
+          let(:user) { nil }
+          let!(:static_page_1) { create(:static_page, organization: organization, show_in_footer: true, allow_public_access: true) }
+          let!(:static_page_topic1) { create(:static_page_topic, organization: organization, show_in_footer: true) }
+          let!(:static_page_topic1_page1) do
+            create(
+              :static_page,
+              organization: organization,
+              topic: static_page_topic1,
+              weight: 0,
+              allow_public_access: false
+            )
+          end
+          let!(:static_page_topic1_page2) do
+            create(
+              :static_page,
+              organization: organization,
+              topic: static_page_topic1,
+              weight: 1,
+              allow_public_access: true
+            )
+          end
+          let!(:static_page_topic2) { create(:static_page_topic, organization: organization, show_in_footer: true) }
+          let!(:static_page_topic2_page1) { create(:static_page, organization: organization, topic: static_page_topic2, weight: 0) }
+          let!(:static_page_topic2_page2) { create(:static_page, organization: organization, topic: static_page_topic2, weight: 1) }
+          let!(:static_page_topic3) { create(:static_page_topic, organization: organization) }
+          let!(:static_page_topic3_page1) { create(:static_page, organization: organization, topic: static_page_topic3) }
+
+          # Re-visit required for the added pages and topics to be visible and
+          # to sign in the user when it is defined.
+          before do
+            login_as user, scope: :user if user
+            visit current_path
+          end
+
+          context "when authenticated" do
+            let(:user) { create :user, :confirmed, organization: organization }
+
+            it_behaves_like "accessible page"
+
+            it "displays all pages and topics in footer that are configured to display in footer" do
+              expect(page).to have_content(static_page_1.title["en"])
+              expect(page).to have_content(static_page_2.title["en"])
+              expect(page).to have_no_content(static_page_3.title["en"])
+              expect(page).to have_content(static_page_topic1.title["en"])
+              expect(page).to have_content(static_page_topic2.title["en"])
+              expect(page).to have_no_content(static_page_topic3.title["en"])
+
+              expect(page).to have_link(
+                static_page_topic1.title["en"],
+                href: "/pages/#{static_page_topic1_page1.slug}"
+              )
+              expect(page).to have_link(
+                static_page_topic2.title["en"],
+                href: "/pages/#{static_page_topic2_page1.slug}"
+              )
+            end
+          end
+        end
       end
 
       describe "includes statistics" do
@@ -206,7 +270,7 @@
 
           it "shows the statistics block" do
             within "#statistics" do
-              expect(page).to have_content("Current state of #{organization.name}")
+              expect(page).to have_content("Current state of ")
               expect(page).to have_content("PROCESSES")
               expect(page).to have_content("PARTICIPANTS")
             end
@@ -302,6 +366,27 @@
         end
       end
 
+      describe "decidim link with external icon" do
+        before { visit current_path }
+
+        let(:webpacker_helper) do
+          Class.new do
+            include ActionView::Helpers::AssetUrlHelper
+            include Webpacker::Helper
+          end.new
+        end
+
+        it "displays the decidim link with external link indicator" do
+          within ".footer .mini-footer" do
+            expect(page).to have_selector("a[target='_blank'][href='https://github.com/decidim/decidim']")
+
+            within "a[target='_blank'][href='https://github.com/decidim/decidim']" do
+              expect(page).to have_selector("svg.icon use[href='#{webpacker_helper.asset_pack_path("media/images/icons.svg")}#icon-external-link']")
+            end
+          end
+        end
+      end
+
       context "and has highlighted content banner enabled" do
         let(:organization) do
           create(:organization,
diff --git a/spec/system/locales_spec.rb b/spec/system/locales_spec.rb
index 1646c4ed..9008d402 100644
--- a/spec/system/locales_spec.rb
+++ b/spec/system/locales_spec.rb
@@ -4,24 +4,26 @@
 
 describe "Locales", type: :system do
   describe "switching locales" do
-    let(:organization) { create(:organization, available_locales: %w(en ca)) }
+    let(:organization) { create(:organization, available_locales: %w(fr en), default_locale: "en") }
+    let(:user) { create(:user, :confirmed, locale: "en", organization: organization) }
 
     before do
       switch_to_host(organization.host)
+      login_as user, scope: :user
       visit decidim.root_path
     end
 
     it "changes the locale to the chosen one" do
       within_language_menu do
-        click_link "Català"
+        click_link "Français"
       end
 
-      expect(page).to have_content("Inici")
+      expect(page).to have_content("Accueil")
     end
 
     it "only shows the available locales" do
       within_language_menu do
-        expect(page).to have_content("Català")
+        expect(page).to have_content("Français")
         expect(page).to have_content("English")
         expect(page).to have_no_content("Castellano")
       end
@@ -29,49 +31,54 @@
 
     it "keeps the locale between pages" do
       within_language_menu do
-        click_link "Català"
+        click_link "Français"
       end
 
-      click_link "Inici"
+      click_link "Accueil"
 
-      expect(page).to have_content("Inici")
+      expect(page).to have_content("Accueil")
     end
 
-    it "displays devise messages with the right locale when not authenticated " do
-      within_language_menu do
-        click_link "Català"
-      end
+    context "when not authenticated" do
+      let(:user) { nil }
 
-      visit decidim_admin.root_path
+      it "displays devise messages with the right locale when not authenticated" do
+        within_language_menu do
+          click_link "Français"
+        end
 
-      expect(page).to have_content("Has d'iniciar la sessió o registrar-te abans de continuar.")
-    end
+        visit decidim_admin.root_path
 
-    it "displays devise messages with the right locale when authentication fails " do
-      within_language_menu do
-        click_link "Català"
+        expect(page).to have_content("Vous devez vous identifier ou vous créer un compte avant de continuer")
       end
+    end
 
-      find(".sign-in-link").click
+    context "when authentication fails" do
+      let(:user) { nil }
 
-      fill_in "session_user_email", with: "toto@example.org"
-      fill_in "session_user_password", with: "toto"
+      it "displays devise messages with the right locale" do
+        within_language_menu do
+          click_link "Français"
+        end
 
-      click_button "Iniciar sessió"
+        find(".sign-in-link").click
 
-      expect(page).to have_content("Email o la contrasenya no són vàlids.")
-    end
+        fill_in "session_user_email", with: "toto@example.org"
+        fill_in "session_user_password", with: "toto"
 
-    context "with a signed in user" do
-      let(:user) { create(:user, :confirmed, locale: "ca", organization: organization) }
+        click_button "S'identifier"
 
-      before do
-        login_as user, scope: :user
-        visit decidim.root_path
+        expect(page).to have_content("Email ou mot de passe invalide")
       end
+    end
+
+    context "with a signed in user" do
+      let(:user) { create(:user, :confirmed, locale: "fr", organization: organization) }
 
-      it "uses the user's locale" do
-        expect(page).to have_content("Inici")
+      it "displays content based on user's locale" do
+        expect(page).not_to have_content("Sign in")
+        expect(page).not_to have_content("S'identifier")
+        expect(page).to have_content("Accueil")
       end
     end
   end
diff --git a/spec/system/user_tos_acceptance_spec.rb b/spec/system/user_tos_acceptance_spec.rb
index 3c53271e..435877a5 100644
--- a/spec/system/user_tos_acceptance_spec.rb
+++ b/spec/system/user_tos_acceptance_spec.rb
@@ -75,7 +75,7 @@
 
         it "shows an option to download the users data" do
           within "#tos-refuse-modal" do
-            expect(page).to have_link("download your data", href: decidim.data_portability_path)
+            expect(page).to have_link("download your data", href: decidim.download_your_data_path)
           end
         end