diff --git a/.ruby-version b/.ruby-version
index e70b452..9cec716 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.0
+3.1.6
diff --git a/Dockerfile b/Dockerfile
index 88aaf10..00c8889 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM ruby:2.6
+FROM ruby:3.1.6
 RUN apt-get update -qq && apt-get install -y npm nodejs postgresql-client net-tools iproute2 iputils-ping
 RUN mkdir /usr/src/app
 ADD . /usr/src/app
diff --git a/Gemfile b/Gemfile
index 9fbed2f..38f004f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,16 +1,18 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.10'
+ruby '3.1.6'
+
+# Modern Ruby with Rails compatibility
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.0'
+gem 'rails', '~> 6.1.0'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 5.6'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5'
+gem 'sass-rails', '~> 6.0'
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
 gem 'webpacker', '~> 4.0'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
@@ -22,9 +24,9 @@ gem 'redis', '~> 4.0'
 # Use Active Model has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 gem 'rest-client', '~> 2.0'
-gem 'elasticsearch-model', '~> 2.0'
-gem 'elasticsearch-rails', '~> 2.0'
-gem 'sidekiq', '~> 5.2.5'
+gem 'elasticsearch-model', '~> 7.0'
+gem 'elasticsearch-rails', '~> 7.0'
+gem 'sidekiq', '~> 6.5'
 gem 'sidekiq-scheduler'
 gem 'pry'
 gem "sidekiq-cron", "~> 1.1"
@@ -42,7 +44,7 @@ end
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
-  gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'listen', '~> 3.8'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index af46f1e..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,323 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.0.4)
-      actionpack (= 6.0.4)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4)
-      actionpack (= 6.0.4)
-      activejob (= 6.0.4)
-      activerecord (= 6.0.4)
-      activestorage (= 6.0.4)
-      activesupport (= 6.0.4)
-      mail (>= 2.7.1)
-    actionmailer (6.0.4)
-      actionpack (= 6.0.4)
-      actionview (= 6.0.4)
-      activejob (= 6.0.4)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.4)
-      actionview (= 6.0.4)
-      activesupport (= 6.0.4)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.4)
-      actionpack (= 6.0.4)
-      activerecord (= 6.0.4)
-      activestorage (= 6.0.4)
-      activesupport (= 6.0.4)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.4)
-      activesupport (= 6.0.4)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.4)
-      activesupport (= 6.0.4)
-      globalid (>= 0.3.6)
-    activemodel (6.0.4)
-      activesupport (= 6.0.4)
-    activerecord (6.0.4)
-      activemodel (= 6.0.4)
-      activesupport (= 6.0.4)
-    activestorage (6.0.4)
-      actionpack (= 6.0.4)
-      activejob (= 6.0.4)
-      activerecord (= 6.0.4)
-      marcel (~> 1.0.0)
-    activesupport (6.0.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    bindex (0.8.1)
-    bootsnap (1.7.7)
-      msgpack (~> 1.0)
-    builder (3.2.4)
-    byebug (11.1.3)
-    capybara (3.35.3)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (>= 1.5, < 3.0)
-      xpath (~> 3.2)
-    childprocess (3.0.0)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    connection_pool (2.2.5)
-    crass (1.0.6)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    e2mmap (0.1.0)
-    elasticsearch (2.0.2)
-      elasticsearch-api (= 2.0.2)
-      elasticsearch-transport (= 2.0.2)
-    elasticsearch-api (2.0.2)
-      multi_json
-    elasticsearch-model (2.0.1)
-      activesupport (> 3)
-      elasticsearch (~> 2)
-      hashie
-    elasticsearch-rails (2.0.1)
-    elasticsearch-transport (2.0.2)
-      faraday
-      multi_json
-    erubi (1.10.0)
-    et-orbi (1.2.4)
-      tzinfo
-    faraday (1.7.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    ffi (1.15.3)
-    fugit (1.5.0)
-      et-orbi (~> 1.1, >= 1.1.8)
-      raabro (~> 1.4)
-    globalid (0.5.2)
-      activesupport (>= 5.0)
-    hashie (4.1.0)
-    http-accept (1.7.0)
-    http-cookie (1.0.4)
-      domain_name (~> 0.5)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    jbuilder (2.11.2)
-      activesupport (>= 5.0.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    loofah (2.11.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (1.0.1)
-    method_source (1.0.0)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
-    mini_mime (1.1.0)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
-    msgpack (1.4.2)
-    multi_json (1.15.0)
-    multipart-post (2.1.1)
-    netrc (0.11.0)
-    nio4r (2.5.8)
-    nokogiri (1.12.2)
-      mini_portile2 (~> 2.6.1)
-      racc (~> 1.4)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-rails (0.3.9)
-      pry (>= 0.10.4)
-    public_suffix (4.0.6)
-    puma (3.12.6)
-    raabro (1.4.0)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-protection (2.1.0)
-      rack
-    rack-proxy (0.7.0)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.4)
-      actioncable (= 6.0.4)
-      actionmailbox (= 6.0.4)
-      actionmailer (= 6.0.4)
-      actionpack (= 6.0.4)
-      actiontext (= 6.0.4)
-      actionview (= 6.0.4)
-      activejob (= 6.0.4)
-      activemodel (= 6.0.4)
-      activerecord (= 6.0.4)
-      activestorage (= 6.0.4)
-      activesupport (= 6.0.4)
-      bundler (>= 1.3.0)
-      railties (= 6.0.4)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.0.4)
-      actionpack (= 6.0.4)
-      activesupport (= 6.0.4)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.6)
-    rb-fsevent (0.11.0)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    redis (4.1.4)
-    regexp_parser (2.1.1)
-    rest-client (2.1.0)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    ruby2_keywords (0.0.5)
-    ruby_dep (1.5.0)
-    rubyzip (2.3.2)
-    rufus-scheduler (3.8.0)
-      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)
-    sass-rails (5.1.0)
-      railties (>= 5.2.0)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
-      rubyzip (>= 1.2.2)
-    sidekiq (5.2.9)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (~> 2.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 4.2)
-    sidekiq-cron (1.2.0)
-      fugit (~> 1.1)
-      sidekiq (>= 4.2.1)
-    sidekiq-scheduler (3.1.0)
-      e2mmap
-      redis (>= 3, < 5)
-      rufus-scheduler (~> 3.2)
-      sidekiq (>= 3)
-      thwait
-      tilt (>= 1.4.0)
-    spring (2.1.1)
-    spring-watcher-listen (2.0.1)
-      listen (>= 2.7, < 4.0)
-      spring (>= 1.2, < 3.0)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    thwait (0.2.0)
-      e2mmap
-    tilt (2.0.10)
-    turbolinks (5.2.1)
-      turbolinks-source (~> 5.2)
-    turbolinks-source (5.2.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-    web-console (4.1.0)
-      actionview (>= 6.0.0)
-      activemodel (>= 6.0.0)
-      bindex (>= 0.4.0)
-      railties (>= 6.0.0)
-    webdrivers (4.6.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (>= 3.0, < 4.0)
-    webpacker (4.3.0)
-      activesupport (>= 4.2)
-      rack-proxy (>= 0.6.1)
-      railties (>= 4.2)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-    zeitwerk (2.4.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bootsnap (>= 1.4.2)
-  byebug
-  capybara (>= 2.15)
-  elasticsearch-model (~> 2.0)
-  elasticsearch-rails (~> 2.0)
-  jbuilder (~> 2.7)
-  listen (>= 3.0.5, < 3.2)
-  pry
-  pry-rails
-  puma (~> 3.11)
-  rails (~> 6.0.0)
-  redis (~> 4.0)
-  rest-client (~> 2.0)
-  sass-rails (~> 5)
-  selenium-webdriver
-  sidekiq (~> 5.2.5)
-  sidekiq-cron (~> 1.1)
-  sidekiq-scheduler
-  spring
-  spring-watcher-listen (~> 2.0.0)
-  sqlite3 (~> 1.4)
-  turbolinks (~> 5)
-  tzinfo-data
-  web-console (>= 3.3.0)
-  webdrivers
-  webpacker (~> 4.0)
-
-RUBY VERSION
-   ruby 2.6.0p0
-
-BUNDLED WITH
-   1.17.2
diff --git a/config/boot.rb b/config/boot.rb
index b9e460c..71bdcdd 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,4 +1,5 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
-require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+require 'logger' # Ensure Logger is available for Ruby 3.x compatibility
+# require 'bootsnap/setup' # Speed up boot time by caching expensive operations.