diff --git a/mir_connector/inorbit_mir_connector/src/connector.py b/mir_connector/inorbit_mir_connector/src/connector.py
index 8e91a31..b1e7868 100644
--- a/mir_connector/inorbit_mir_connector/src/connector.py
+++ b/mir_connector/inorbit_mir_connector/src/connector.py
@@ -11,6 +11,7 @@
 from inorbit_edge.robot import COMMAND_CUSTOM_COMMAND
 from inorbit_edge.robot import COMMAND_MESSAGE
 from inorbit_edge.robot import COMMAND_NAV_GOAL
+from inorbit_mir_connector import get_module_version
 from .mir_api import MirApiV2
 from .mir_api import MirWebSocketV2
 from .mission import MirInorbitMissionTracking
@@ -113,8 +114,8 @@ def _inorbit_command_handler(self, command_name, args, options):
                 - `metadata` is reserved for the future and will contains additional
                 information about the received command request.
         """
+        self._logger.info(f"Received '{command_name}'!. {args}")
         if command_name == COMMAND_CUSTOM_COMMAND:
-            self._logger.info(f"Received '{command_name}'!. {args}")
             if len(args) < 2:
                 self._logger.error("Invalid number of arguments: ", args)
                 options["result_function"](
@@ -194,7 +195,6 @@ def _inorbit_command_handler(self, command_name, args, options):
             # Return '0' for success
             options["result_function"]("0")
         elif command_name == COMMAND_NAV_GOAL:
-            self._logger.info(f"Received '{command_name}'!. {args}")
             pose = args[0]
             self.send_waypoint_over_missions(pose)
         elif command_name == COMMAND_MESSAGE:
@@ -264,6 +264,7 @@ def _execution_loop(self):
         # publish key values
         # TODO(Elvio): Move key values to a "values.py" and represent them with constants
         key_values = {
+            "connector_version": get_module_version(),
             "battery percent": self.status["battery_percentage"],
             "battery_time_remaining": self.status["battery_time_remaining"],
             "uptime": self.status["uptime"],
diff --git a/mir_connector/inorbit_mir_connector/tests/test_connector.py b/mir_connector/inorbit_mir_connector/tests/test_connector.py
index 74dca9d..0dbcdfd 100644
--- a/mir_connector/inorbit_mir_connector/tests/test_connector.py
+++ b/mir_connector/inorbit_mir_connector/tests/test_connector.py
@@ -12,6 +12,7 @@
 from inorbit_mir_connector.src.mir_api import MirApiV2
 from inorbit_mir_connector.src.connector import Mir100Connector
 from inorbit_mir_connector.config.mir100_model import MiR100Config
+from .. import get_module_version
 
 
 @pytest.fixture
@@ -366,6 +367,7 @@ def run_loop_once():
     )
     assert connector._robot_session.publish_key_values.call_args == call(
         {
+            "connector_version": get_module_version(),
             "battery percent": 93.5,
             "battery_time_remaining": 89725,
             "uptime": 3552693,