diff --git a/caimira/apps/expert.py b/caimira/apps/expert.py
index 39daf3c3..79c64c2b 100644
--- a/caimira/apps/expert.py
+++ b/caimira/apps/expert.py
@@ -933,7 +933,7 @@ class CAIMIRAStateBuilder(state.StateBuilder):
 class ExpertApplication(Controller):
     def __init__(self) -> None:
         LOG.warning(
-            "ExpertApplication is deprecated and will no longer be maintained. It remains in the codebase for legacy purposes."
+            "ExpertApplication is currently deactivated and will no longer be maintained. It remains in the codebase for legacy purposes."
         )
 
         self._data_registry = DataRegistry()
diff --git a/caimira/apps/expert_co2.py b/caimira/apps/expert_co2.py
index 62e23f82..29964bf9 100644
--- a/caimira/apps/expert_co2.py
+++ b/caimira/apps/expert_co2.py
@@ -192,7 +192,7 @@ class ExposureComparisonResult(View):
 class CO2Application(Controller):
     def __init__(self) -> None:
         LOG.warning(
-            "CO2Application is deprecated and will no longer be maintained. It remains in the codebase for legacy purposes."
+            "CO2Application is currently deactivated and will no longer be maintained. It remains in the codebase for legacy purposes."
         )
 
         self._data_registry = DataRegistry()
diff --git a/caimira/apps/templates/expert-app.html.j2 b/caimira/apps/templates/expert-app.html.j2
index 039c9690..5e18a638 100644
--- a/caimira/apps/templates/expert-app.html.j2
+++ b/caimira/apps/templates/expert-app.html.j2
@@ -4,7 +4,7 @@
 
 <div class="container container--padding" style="word-wrap:break-word";> 
 
-<h1 class="paragraph-title">CAiMIRA Expert Apps were deprecated in version 4.16.0</h1><br>
+<h1 class="paragraph-title">CAiMIRA Expert Apps currently deactivated</h1><br>
 
 With the latest feature implementations in the core CAiMIRA engine, the <b>ExpertApplication</b> and <b>CO2Application</b> apps are no longer actively maintained.
 For legacy purposes, the source code is still available in the <a href="https://gitlab.cern.ch/caimira/caimira/">GitLab</a> repository.
diff --git a/caimira/tests/apps/test_expert_app.py b/caimira/tests/apps/test_expert_app.py
index 85a35406..d320f073 100644
--- a/caimira/tests/apps/test_expert_app.py
+++ b/caimira/tests/apps/test_expert_app.py
@@ -8,7 +8,7 @@ def expert_app():
     return caimira.apps.ExpertApplication()
 
 
-@pytest.mark.skip(reason="ExpertApplication is deprecated")
+@pytest.mark.skip(reason="ExpertApplication is deactivated")
 def test_app(expert_app):
     # To start with, let's just test that the application runs. We don't try to
     # do anything fancy to verify how it looks etc., we leave that for manual
@@ -16,7 +16,7 @@ def test_app(expert_app):
     assert expert_app._model_scenarios[0][0] == "Scenario 1"
 
 
-@pytest.mark.skip(reason="ExpertApplication is deprecated")
+@pytest.mark.skip(reason="ExpertApplication is deactivated")
 def test_new_scenario_changes_tab(expert_app):
     # Adding a new scenario should change the tab index of the multi-model view.
     assert expert_app.multi_model_view.widget.selected_index == 0