diff --git a/src/main.py b/src/main.py
index e26200f..a0ef2f6 100644
--- a/src/main.py
+++ b/src/main.py
@@ -91,8 +91,8 @@ CLIENT_ID = f"{CLIENT_PREFIX}_{uuid.uuid4()}"
 topic_mapping = {}
 
 # Callback function for successful connection to the broker
-def on_connect(client, userdata, flags, rc):
-    if rc == 0:
+def on_connect(client, userdata, flags, reason_code, properties):
+    if reason_code == 0:
         logger.info("Connected to the broker")
         
         # Subscribe to dynamically generated topics for each box and create mappings
@@ -125,7 +125,7 @@ def on_connect(client, userdata, flags, rc):
             topic_mapping[central_topic] = ("__central__", central_key)
             logger.info(f"Subscribed to central topic '{central_topic}' (Key: '{central_key}')")
     else:
-        logger.error(f"Connection error with code {rc}")
+        logger.error(f"Connection error with code {reason_code}")
 
 # Callback function for received messages
 def on_message(client, userdata, msg):
@@ -149,8 +149,8 @@ def on_message(client, userdata, msg):
         logger.error(f"Error processing message from '{msg.topic}': {e}")
 
 # Callback function for disconnection
-def on_disconnect(client, userdata, rc):
-    if rc != 0:
+def on_disconnect(client, userdata, flags, reason_code, properties):
+    if reason_code != 0:
         logger.warning("Unexpected disconnection, attempting to reconnect...")
     else:
         logger.info("Disconnected from the broker.")
@@ -161,7 +161,7 @@ def handle_exit_signal(signum, frame):
     client.disconnect()  # Disconnects from the broker and stops loop_forever()
 
 # Initialize the MQTT client and configure callbacks
-client = mqtt.Client(client_id=CLIENT_ID)
+client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2, client_id=CLIENT_ID, )
 
 context['client'] = client