diff --git a/Dockerfile b/Dockerfile
index e70c732..13a80a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,6 +41,9 @@ RUN [[ ${BUILD_SCRIPT} ]] && bash -c "${BUILD_SCRIPT}"
 # Install specific versions of dependencies
 RUN gem install bundler:${BUNDLER_VERSION} --no-document
 
+RUN gem install activerecord-nulldb-adapter
+ENV RAILS_DB_ADAPTER=nulldb
+
 # TODO: Load artifacts
 
 # set up app-src directory
diff --git a/Gemfile b/Gemfile
index d7dc092..4f5db8d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,6 +19,7 @@ gem 'decidim-decidim_awesome', github: 'Platoniq/decidim-module-decidim_awesome'
 gem 'decidim-jitsi_meetings', github: 'puzzle/decidim-module-jitsi-meetings', branch: DECIDIM_VERSION, ref: '6d32dd1'
 gem 'decidim-navigation_maps', '~> 1.3.0'
 gem 'decidim-question_captcha', github: 'Kagemaru/decidim-module-question_captcha'
+gem 'decidim-reporting_proposals'
 gem 'decidim-term_customizer', github: 'mainio/decidim-module-term_customizer', ref: 'develop'
 
 # TODO: These are not updated yet :(
diff --git a/Gemfile.lock b/Gemfile.lock
index 56ff80c..08583e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -385,6 +385,12 @@ GEM
       decidim-core (= 0.26.1)
       doc2text (~> 0.4.4)
       redcarpet (~> 3.5, >= 3.5.1)
+    decidim-reporting_proposals (0.2.0)
+      decidim-admin (>= 0.25.0, < 0.27)
+      decidim-core (>= 0.25.0, < 0.27)
+      decidim-participatory_processes (>= 0.25.0, < 0.27)
+      decidim-proposals (>= 0.25.0, < 0.27)
+      deface (>= 1.9)
     decidim-sortitions (0.26.1)
       decidim-admin (= 0.26.1)
       decidim-comments (= 0.26.1)
@@ -408,6 +414,12 @@ GEM
     declarative-builder (0.1.0)
       declarative-option (< 0.2.0)
     declarative-option (0.1.0)
+    deface (1.9.0)
+      actionview (>= 5.2)
+      nokogiri (>= 1.6)
+      polyglot
+      railties (>= 5.2)
+      rainbow (>= 2.1.0)
     delayed_job (4.1.10)
       activesupport (>= 3.0, < 8.0)
     delayed_job_active_record (4.1.7)
@@ -625,6 +637,7 @@ GEM
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
+    polyglot (0.3.5)
     premailer (1.16.0)
       addressable
       css_parser (>= 1.6.0)
@@ -912,6 +925,7 @@ DEPENDENCIES
   decidim-navigation_maps (~> 1.3.0)
   decidim-proposals (= 0.26.1)
   decidim-question_captcha!
+  decidim-reporting_proposals
   decidim-templates (= 0.26.1)
   decidim-term_customizer!
   delayed_job_active_record
@@ -936,4 +950,4 @@ RUBY VERSION
    ruby 2.7.2p137
 
 BUNDLED WITH
-   2.3.23
+   2.3.22
diff --git a/app/overrides/uploaders/decidim/data_portability_uploader_override_bak.rb b/app/overrides/uploaders/decidim/data_portability_uploader_override_bak.rb
deleted file mode 100644
index ba5fce1..0000000
--- a/app/overrides/uploaders/decidim/data_portability_uploader_override_bak.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-# TODO: Commented for Decidim upgrade
-Decidim::DataPortabilityUploader.class_eval do
-  # Override validation, same as OpenDataUploader
-  def validate_inside_organization
-    true
-  end
-end
diff --git a/db/migrate/20230302145314_create_decidim_categories_valuators.decidim_reporting_proposals.rb b/db/migrate/20230302145314_create_decidim_categories_valuators.decidim_reporting_proposals.rb
new file mode 100644
index 0000000..5bb0201
--- /dev/null
+++ b/db/migrate/20230302145314_create_decidim_categories_valuators.decidim_reporting_proposals.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+# This migration comes from decidim_reporting_proposals (originally 20221219151846)
+
+class CreateDecidimCategoriesValuators < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_reporting_proposals_category_valuators do |t|
+      t.references :decidim_category, null: false, foreign_key: { to_table: "decidim_categories" }, index: { name: "decidim_reporting_proposals_category_category_id" }
+      t.references :valuator_role, polymorphic: true, null: false, index: { name: "decidim_reporting_proposals_category_valuator_role" }
+
+      t.timestamps
+    end
+
+    add_index :decidim_reporting_proposals_category_valuators,
+              [:decidim_category_id, :valuator_role_id, :valuator_role_type],
+              unique: true,
+              name: "decidim_reporting_proposals_category_valuator_unique"
+  end
+end