diff --git a/.env.example b/.env.example
index c70dc9fc..30ffddba 100644
--- a/.env.example
+++ b/.env.example
@@ -75,5 +75,6 @@ MEILI_HOST="http://meilisearch:7700"
 MEILI_MASTER_KEY="ghvjkgisbgkbgskegblfqbgjkebbhgwkjfb"
 
 RABBITMQ_HOST=rabbitmq
+RABBITMQ_PORT=5672
 RABBITMQ_DEFAULT_USER=kyoo
 RABBITMQ_DEFAULT_PASS=aohohunuhouhuhhoahothonseuhaoensuthoaentsuhha
diff --git a/autosync/autosync/__init__.py b/autosync/autosync/__init__.py
index 8b1eda73..58727949 100644
--- a/autosync/autosync/__init__.py
+++ b/autosync/autosync/__init__.py
@@ -46,6 +46,7 @@ def main():
 	connection = pika.BlockingConnection(
 		pika.ConnectionParameters(
 			host=os.environ.get("RABBITMQ_HOST", "rabbitmq"),
+			port=os.environ.get("RABBITMQ_PORT", 5672),
 			credentials=pika.credentials.PlainCredentials(
 				os.environ.get("RABBITMQ_DEFAULT_USER", "guest"),
 				os.environ.get("RABBITMQ_DEFAULT_PASS", "guest"),
diff --git a/autosync/autosync/services/simkl.py b/autosync/autosync/services/simkl.py
index c78319d9..74df8cbc 100644
--- a/autosync/autosync/services/simkl.py
+++ b/autosync/autosync/services/simkl.py
@@ -56,7 +56,7 @@ class Simkl(Service):
 					]
 				},
 				headers={
-					"Authorization": f"Bearer {user.external_id["simkl"].token.access_token}",
+					"Authorization": f"Bearer {user.external_id['simkl'].token.access_token}",
 					"simkl-api-key": self._api_key,
 				},
 			)
@@ -85,7 +85,7 @@ class Simkl(Service):
 				]
 			},
 			headers={
-				"Authorization": f"Bearer {user.external_id["simkl"].token.access_token}",
+				"Authorization": f"Bearer {user.external_id['simkl'].token.access_token}",
 				"simkl-api-key": self._api_key,
 			},
 		)
diff --git a/back/src/Kyoo.RabbitMq/RabbitMqModule.cs b/back/src/Kyoo.RabbitMq/RabbitMqModule.cs
index 86b7b3d8..aba89bb2 100644
--- a/back/src/Kyoo.RabbitMq/RabbitMqModule.cs
+++ b/back/src/Kyoo.RabbitMq/RabbitMqModule.cs
@@ -35,7 +35,7 @@ public static class RabbitMqModule
 					UserName = builder.Configuration.GetValue("RABBITMQ_DEFAULT_USER", "guest"),
 					Password = builder.Configuration.GetValue("RABBITMQ_DEFAULT_PASS", "guest"),
 					HostName = builder.Configuration.GetValue("RABBITMQ_HOST", "rabbitmq"),
-					Port = 5672,
+					Port = builder.Configuration.GetValue("RABBITMQ_Port", 5672),
 				};
 
 			return factory.CreateConnection();
diff --git a/scanner/matcher/subscriber.py b/scanner/matcher/subscriber.py
index 728cf5bd..ca2fc603 100644
--- a/scanner/matcher/subscriber.py
+++ b/scanner/matcher/subscriber.py
@@ -10,27 +10,34 @@ from matcher.matcher import Matcher
 
 logger = logging.getLogger(__name__)
 
+
 class Message(Struct, tag_field="action", tag=str.lower):
 	pass
 
+
 class Scan(Message):
 	path: str
 
+
 class Delete(Message):
 	path: str
 
+
 class Refresh(Message):
 	kind: Literal["collection", "show", "movie", "season", "episode"]
 	id: str
 
+
 decoder = json.Decoder(Union[Scan, Delete, Refresh])
 
+
 class Subscriber:
 	QUEUE = "scanner"
 
 	async def __aenter__(self):
 		self._con = await connect_robust(
 			host=os.environ.get("RABBITMQ_HOST", "rabbitmq"),
+			port=int(os.environ.get("RABBITMQ_PORT", "5672")),
 			login=os.environ.get("RABBITMQ_DEFAULT_USER", "guest"),
 			password=os.environ.get("RABBITMQ_DEFAULT_PASS", "guest"),
 		)
diff --git a/scanner/scanner/publisher.py b/scanner/scanner/publisher.py
index 7a99295d..2c4e1838 100644
--- a/scanner/scanner/publisher.py
+++ b/scanner/scanner/publisher.py
@@ -9,6 +9,7 @@ class Publisher:
 	async def __aenter__(self):
 		self._con = await connect_robust(
 			host=os.environ.get("RABBITMQ_HOST", "rabbitmq"),
+			port=int(os.environ.get("RABBITMQ_PORT", "5672")),
 			login=os.environ.get("RABBITMQ_DEFAULT_USER", "guest"),
 			password=os.environ.get("RABBITMQ_DEFAULT_PASS", "guest"),
 		)