diff --git a/src/charm.py b/src/charm.py
index dba22bb2..df8183ff 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -282,7 +282,8 @@ def _default_config(self):
                         "juju_model": self._topology.model,
                         "juju_model_uuid": self._topology.model_uuid,
                         "juju_application": self._topology.application,
-                        "juju_unit": self._topology.charm_name,
+                        "juju_unit": self._topology.unit,
+                        "juju_charm": self._topology.charm_name,
                         "host": "localhost",
                     },
                 }
diff --git a/tox.ini b/tox.ini
index ff06063c..dc8ec5d8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -94,7 +94,7 @@ deps =
     cosl
     ops >= 2.5.0
     pytest
-    ops-scenario >= 5.1
+    ops-scenario >=5.1,<6.0
     -r{toxinidir}/requirements.txt
     opentelemetry-exporter-otlp-proto-grpc==1.17.0  # PYDEPS for tracing
     importlib-metadata==6.0.0  # PYDEPS for tracing