diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d27a9b8031d8c63da6ba6628ae56aad30dd07b2e..67a913306ed09abb5d90be9f2b5775a476768e2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,7 @@ build_development:
   script:
     - export TAG=dev
     - export MAIL_SERVICE_BIND_PORT=3000
+    - export RABBITMQ_LISTENING_PORT=5672
     - export RABBITMQ_GUI_PORT=15672
     - docker-compose build 
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -26,6 +27,7 @@ build_release:
   script:
     - export TAG=$CI_COMMIT_TAG
     - export MAIL_SERVICE_BIND_PORT=3000
+    - export RABBITMQ_LISTENING_PORT=5672
     - export RABBITMQ_GUI_PORT=15672
     - docker-compose build
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -38,6 +40,7 @@ deploy_development:
   script:
     - export TAG=dev
     - export MAIL_SERVICE_BIND_PORT=3001
+    - export RABBITMQ_LISTENING_PORT=5673
     - export RABBITMQ_GUI_PORT=15672
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker-compose pull
diff --git a/docker-compose.yml b/docker-compose.yml
index ec9e000be5767493c7c80dce5af0451875c864b9..fff000d9f83f9f9e500404e2c9ad956078517b04 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
   rabbitmq:
     image: rabbitmq:3-management-alpine
     ports:
-    # - ${RABBITMQ_LISTENING_PORT}:5672 # standard port for communication
+      - ${RABBITMQ_LISTENING_PORT}:5672 # standard port for communication
       - ${RABBITMQ_GUI_PORT}:15672 # graphic interface
     environment:
       - RABBITMQ_DEFAULT_USER=rabbitmq-user