diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index ce6ecb1ac2..24cea0e4af 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -78,7 +78,7 @@ http:
 # MQTT server parameters
 mqtt:
   bind_address: "${MQTT_BIND_ADDRESS:0.0.0.0}"
-  bind_port: "${MQTT_BIND_PORT:1884}"
+  bind_port: "${MQTT_BIND_PORT:1883}"
   adaptor: "${MQTT_ADAPTOR_NAME:JsonMqttAdaptor}"
   timeout: "${MQTT_TIMEOUT:10000}"
   netty:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 2617133206..97873e82ce 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -20,8 +20,8 @@ services:
   thingsboard:
     image: "thingsboard/application:1.2.3"
     ports:
-      - "8443:8443"
-      - "1884:1883"
+      - "8080:8080"
+      - "1883:1883"
       - "5683:5683/udp"
     env_file:
       - thingsboard.env