diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7309ff4..274eb0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- Removed modules ldap_auth, logging_alerts, maillog
+
 ## [3.21.2] 2025-01-07
 
 - Adds missing `http-message-util` requirement and use statement.
diff --git a/composer.json b/composer.json
index fdbcb4f..828bd6c 100644
--- a/composer.json
+++ b/composer.json
@@ -23,6 +23,7 @@
         "dompdf/dompdf": "^2.0",
         "drupal/admin_toolbar": "^3.0",
         "drupal/advancedqueue": "^1.0",
+        "drupal/cache_control_override": "^1.1|^2.0",
         "drupal/clientside_validation": "^4.0",
         "drupal/coc_forms_auto_export": "^2.0@alpha",
         "drupal/config_entity_revisions": "dev-2.0.x",
@@ -31,14 +32,13 @@
         "drupal/entity_print": "^2.1",
         "drupal/eu_cookie_compliance": "^1.8",
         "drupal/events_logging": "^2.0@beta",
+        "drupal/gin": "^3.0-rc",
         "drupal/honeypot": "^2.0",
         "drupal/image_widget_crop": "^2.3",
         "drupal/ldap": "^4.2",
-        "drupal/ldap_auth": "^1.17",
         "drupal/leaflet": "^10.0",
         "drupal/leaflet_layers": "^1.1",
         "drupal/libraries": "^4.0",
-        "drupal/logging_alerts": "^2.0",
         "drupal/maestro": "^3.1",
         "drupal/mailsystem": "^4.1",
         "drupal/masquerade": "^2.0@RC",
@@ -72,6 +72,7 @@
         "os2web/os2web_audit": "^0.1.6",
         "os2web/os2web_datalookup": "^2.0",
         "os2web/os2web_nemlogin": "^1.0",
+        "os2web/os2web_simplesaml": "dev-master",
         "php-http/guzzle7-adapter": "^1.0",
         "phpoffice/phpword": "^0.18.2",
         "symfony/options-resolver": "^5.4 || ^6.0",
@@ -83,7 +84,6 @@
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
         "drupal/coder": "^8.3",
-        "drupal/maillog": "^1.0",
         "mglaman/phpstan-drupal": "^1.1",
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan-deprecation-rules": "^1.1",