diff --git a/.ruby-version b/.ruby-version
index 9e79f6c4..03463f3c 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-3.2.2
+ruby-3.3.0
diff --git a/.tool-versions b/.tool-versions
index f2a971aa..3294aeda 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-ruby 3.2.2
+ruby 3.3.0
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 671c3e60..a41eb9c6 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -10,12 +10,12 @@
 In case you are using an Apple M1 Chip you might run into trouble building
 Ruby. A work around for that is using the command
 
-    rvm install 3.2.2 --with-cflags="-Wno-error=implicit-function-declaration"
+    rvm reinstall 3.3.0 --with-openssl-dir=$(brew --prefix openssl) --with-readline-dir=$(brew --prefix readline) --with-libyaml-dir=$(brew --prefix libyaml) --disable-dtrace --disable-docs
 
 On intel you can proceed with the following:
 
-    rvm install 3.2.2
-    rvm use 3.2.2
+    rvm install 3.3.0
+    rvm use 3.3.0
 
 ## **Main part**
 
@@ -39,26 +39,23 @@ It can be startet on a second shell:
     ./bin/fake_puppet_db &
 
 ## **General things**
+
 - HDM binds per default to port `3000`. fake_puppet_db binds to `8083`.
 - In case of layout errors you can run `bundle exec rails tmp:clear`.
 - To reset your database run at anytime `bundle exec rails db:reset`.
 - The example development puppet configuration can be found in the directory
 `test/fixtures/files/puppet`.
 
-# Integration environment (TBD)
+## Integration environment (TBD)
 
-#TODO: Setup a environment with VMs to have a real puppetserver and puppetdb for testing.
+TODO: Setup a environment with VMs to have a real puppetserver and puppetdb for testing.
 
-# Regnerate gemset
+## Regnerate gemset
 
 If you happen to delete the Gemfile.lock and regenerate it, do not forget about the supported platforms
 
-```bash
-bundle lock --add-platform ruby x86_64-linux x86_64-darwin-22 arm64-darwin
-```
+    bundle lock --add-platform ruby x86_64-linux x86_64-darwin-22 arm64-darwin
 
-# Update gemset
+## Update gemset
 
-```bash
-bundle update
-```
+    bundle update
diff --git a/Dockerfile b/Dockerfile
index 6f0d14c0..fcf7e7cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM ruby:3.2.2-slim-bullseye
+FROM ruby:3.3.0-slim-bookworm
 
 RUN apt update && apt install -y \
       g++ \
       gcc \
       make \
-      libstdc++-10-dev \
+      libstdc++-12-dev \
       libffi-dev \
       libc-dev \
       libxml2-dev \
diff --git a/Gemfile b/Gemfile
index fca180b9..47bca2d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.2.2'
+ruby '3.3.0'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 7.1.3'
@@ -11,28 +11,28 @@ gem 'sqlite3', '~> 1.7'
 gem 'puma', '~> 6.4'
 
 # Asset handling
-gem 'sprockets-rails'
-gem 'importmap-rails'
+gem 'bootstrap', '~> 5.3.0'
+gem 'bootstrap-icons-helper'
 gem 'dartsass-rails'
 gem 'dartsass-sprockets'
-gem 'turbo-rails'
+gem 'importmap-rails'
+gem 'sprockets-rails'
 gem 'stimulus-rails'
-gem 'bootstrap', '~> 5.3.0'
-gem 'bootstrap-icons-helper'
+gem 'turbo-rails'
 
 # Use Active Model has_secure_password
 gem 'bcrypt', '~> 3.1.20'
 
+gem 'breadcrumbs_on_rails'
+gem 'cancancan'
+gem 'diffy'
 gem 'faker'
 gem 'friendly_id', '~> 5.5.1'
-gem 'puppet'
-gem 'puppetdb-ruby', require: 'puppetdb'
 gem 'hiera-eyaml'
 gem 'net-ldap', require: "net/ldap"
-gem 'breadcrumbs_on_rails'
-gem 'cancancan'
+gem 'puppet'
+gem 'puppetdb-ruby', require: 'puppetdb'
 gem 'ruby-saml'
-gem 'diffy'
 
 # To use retry middleware with Faraday v2.0+
 gem 'faraday-retry'
@@ -54,20 +54,20 @@ gem 'listen', '~> 3.2' # need for rake to precompile assets
 group :test do
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara', '>= 2.15'
-  gem 'selenium-webdriver'
   gem 'rspec-openapi'
+  gem 'selenium-webdriver'
 end
 
 group :linter do
   gem 'rubocop', '~> 1.60.2'
-  gem 'rubocop-rails', '~> 2.23.1'
-  gem 'rubocop-rake', '~> 0.6.0'
   gem 'rubocop-capybara', '~> 2.20.0'
   gem 'rubocop-performance', '~> 1.20.2'
+  gem 'rubocop-rails', '~> 2.23.1'
+  gem 'rubocop-rake', '~> 0.6.0'
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1', :require => false
+  gem 'github_changelog_generator', '>= 1.16.1', require: false
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/Gemfile.lock b/Gemfile.lock
index baf3968a..b023b34b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -192,9 +192,6 @@ GEM
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2)
-    google-protobuf (3.25.2-arm64-darwin)
-    google-protobuf (3.25.2-x86_64-darwin)
-    google-protobuf (3.25.2-x86_64-linux)
     hiera-eyaml (3.4.0)
       highline
       optimist
@@ -513,7 +510,7 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.3.0p0
 
 BUNDLED WITH
-   2.4.10
+   2.5.3
diff --git a/MANUAL_INSTALL.md b/MANUAL_INSTALL.md
index 8157a3b7..ccc4a2a2 100644
--- a/MANUAL_INSTALL.md
+++ b/MANUAL_INSTALL.md
@@ -27,8 +27,8 @@ On Alma 8 you must install libyaml-devel:
 
 Now you can install the required ruby version:
 
-    rvm install 3.2.2
-    rvm use 3.2.2
+    rvm install 3.3.0
+    rvm use 3.3.0
 
 ### **Main part**