diff --git a/Gemfile b/Gemfile
index 03173c548..9eab2f8cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,7 +103,10 @@ gem 'view_component'
 gem 'vite_rails'
 gem 'warden'
 gem 'webrick', require: false
+gem 'yabeda-graphql'
 gem 'yabeda-prometheus'
+gem 'yabeda-puma-plugin'
+gem 'yabeda-rails'
 gem 'yabeda-sidekiq'
 gem 'zipline'
 gem 'zxcvbn-ruby', require: 'zxcvbn'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9894c3dc0..e785eaead 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -838,10 +838,22 @@ GEM
       anyway_config (>= 1.0, < 3)
       concurrent-ruby
       dry-initializer
+    yabeda-graphql (0.2.3)
+      graphql (>= 1.9, < 3)
+      yabeda (~> 0.2)
     yabeda-prometheus (0.9.1)
       prometheus-client (>= 3.0, < 5.0)
       rack
       yabeda (~> 0.10)
+    yabeda-puma-plugin (0.7.1)
+      json
+      puma
+      yabeda (~> 0.5)
+    yabeda-rails (0.9.0)
+      activesupport
+      anyway_config (>= 1.3, < 3)
+      railties
+      yabeda (~> 0.8)
     yabeda-sidekiq (0.12.0)
       anyway_config (>= 1.3, < 3)
       sidekiq
@@ -997,7 +1009,10 @@ DEPENDENCIES
   web-console
   webmock
   webrick
+  yabeda-graphql
   yabeda-prometheus
+  yabeda-puma-plugin
+  yabeda-rails
   yabeda-sidekiq
   zipline
   zxcvbn-ruby
diff --git a/README.md b/README.md
index 9fedb71e5..834c11af7 100644
--- a/README.md
+++ b/README.md
@@ -192,3 +192,5 @@ La compatibilité est testée par Browserstack.<br>[<img src="app/assets/images/
 [![View performance data on Skylight](https://badges.skylight.io/status/zAvWTaqO0mu1.svg)](https://oss.skylight.io/app/applications/zAvWTaqO0mu1)
 
 Nous utilisons Skylight pour suivre les performances de notre application.
+
+Par ailleurs, nous utilisons [Yabeda](https://github.com/yabeda-rb/yabeda) pour exporter des metriques au format prometheus. L'activation se fait via la variable d'environnement `PROMETHEUS_EXPORTER_ENABLED` voir config/env.example.optional .
diff --git a/app/graphql/api/v2/schema.rb b/app/graphql/api/v2/schema.rb
index 6ff534a27..43741e10e 100644
--- a/app/graphql/api/v2/schema.rb
+++ b/app/graphql/api/v2/schema.rb
@@ -147,6 +147,7 @@ class API::V2::Schema < GraphQL::Schema
   use Timeout, max_seconds: 30
   use GraphQL::Batch
   use GraphQL::Backtrace
+  use Yabeda::GraphQL
 
   if Rails.env.development?
     class LogQueryDepth < GraphQL::Analysis::AST::QueryDepth
diff --git a/config.ru b/config.ru
index 4a3c09a68..ca1b05049 100644
--- a/config.ru
+++ b/config.ru
@@ -2,5 +2,9 @@
 
 require_relative "config/environment"
 
+if ENV['PROMETHEUS_EXPORTER_ENABLED'] == 'enabled'
+  Yabeda::Prometheus::Exporter.start_metrics_server!
+end
+
 run Rails.application
 Rails.application.load_server
diff --git a/config/env.example.optional b/config/env.example.optional
index df8621781..ffd7ecf02 100644
--- a/config/env.example.optional
+++ b/config/env.example.optional
@@ -244,7 +244,7 @@ REDIS_SIDEKIQ_PASSWORD='sentinel_and_redis_password'
 REDIS_SIDEKIQ_USERNAME='sentinel_and_redis_username'
 
 # configuration for prometheus metrics web server
-# launched with sidekiq
+# launched with sidekiq and puma
 PROMETHEUS_EXPORTER_BIND="0.0.0.0"
 PROMETHEUS_EXPORTER_PORT="9394"
 PROMETHEUS_EXPORTER_ENABLED="disabled"
diff --git a/config/initializers/prometheus_metrics.rb b/config/initializers/prometheus_metrics.rb
new file mode 100644
index 000000000..aa9f7bec5
--- /dev/null
+++ b/config/initializers/prometheus_metrics.rb
@@ -0,0 +1,3 @@
+if ENV['PROMETHEUS_EXPORTER_ENABLED'] == 'enabled' && !Sidekiq.server?
+  Prometheus::Client.config.data_store = Prometheus::Client::DataStores::DirectFileStore.new(dir: Rails.root.join('tmp', 'prometheus'))
+end
diff --git a/config/puma.rb b/config/puma.rb
index 8b9bb8681..470a8760d 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -43,3 +43,6 @@ end
 
 # Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart
+
+activate_control_app
+plugin :yabeda