diff --git a/build/docker-compose-generator/main.go b/build/docker-compose-generator/main.go
index d1abd940866..1d5f9381351 100644
--- a/build/docker-compose-generator/main.go
+++ b/build/docker-compose-generator/main.go
@@ -28,7 +28,7 @@ func main() {
 		"mysql":              3306,
 		"postgres":           5432,
 		"minio":              9000,
-		"inbucket":           10080,
+		"inbucket":           9001,
 		"openldap":           389,
 		"elasticsearch":      9200,
 		"dejavu":             1358,
diff --git a/build/docker-compose.common.yml b/build/docker-compose.common.yml
index 3848b06424c..6b7e860a3ac 100644
--- a/build/docker-compose.common.yml
+++ b/build/docker-compose.common.yml
@@ -68,7 +68,7 @@ services:
     image: "inbucket/inbucket:stable"
     restart: always
     environment:
-      INBUCKET_WEB_ADDR: "0.0.0.0:10080"
+      INBUCKET_WEB_ADDR: "0.0.0.0:9001"
       INBUCKET_POP3_ADDR: "0.0.0.0:10110"
       INBUCKET_SMTP_ADDR: "0.0.0.0:10025"
     networks:
diff --git a/build/docker-compose.yml b/build/docker-compose.yml
index 2065b03aa21..f15c1f6ac5d 100644
--- a/build/docker-compose.yml
+++ b/build/docker-compose.yml
@@ -58,7 +58,7 @@ services:
       - elasticsearch
       - prometheus
       - grafana
-    command: postgres:5432 mysql:3306 minio:9000 inbucket:10080 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000
+    command: postgres:5432 mysql:3306 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000
 
 networks:
   mm-test:
diff --git a/build/dotenv/test.env b/build/dotenv/test.env
index 244c797d95e..62d622f3bb9 100644
--- a/build/dotenv/test.env
+++ b/build/dotenv/test.env
@@ -5,7 +5,7 @@ GOBIN=/mattermost/mattermost-server/bin
 
 CI_INBUCKET_HOST=inbucket
 CI_MINIO_HOST=minio
-CI_INBUCKET_PORT=10080
+CI_INBUCKET_PORT=9001
 CI_MINIO_PORT=9000
 CI_INBUCKET_SMTP_PORT=10025
 CI_LDAP_HOST=openldap
diff --git a/build/gitlab-dc.common.yml b/build/gitlab-dc.common.yml
index fe4ffc15609..c18769c878d 100644
--- a/build/gitlab-dc.common.yml
+++ b/build/gitlab-dc.common.yml
@@ -11,7 +11,7 @@ services:
     image: ${CI_REGISTRY}/mattermost/ci/images/inbucket:v3.0.0-rc1-2-gc64e7a6-1
     restart: always
     environment:
-      INBUCKET_WEB_ADDR: "0.0.0.0:10080"
+      INBUCKET_WEB_ADDR: "0.0.0.0:9001"
       INBUCKET_POP3_ADDR: "0.0.0.0:10110"
       INBUCKET_SMTP_ADDR: "0.0.0.0:10025"
   openldap:
diff --git a/build/gitlab-dc.mysql.yml b/build/gitlab-dc.mysql.yml
index d9146b9bbbf..9b839245351 100644
--- a/build/gitlab-dc.mysql.yml
+++ b/build/gitlab-dc.mysql.yml
@@ -92,7 +92,7 @@ services:
       - elasticsearch
       - prometheus
       - grafana
-    command: mysql:3306 minio:9000 inbucket:10080 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000
+    command: mysql:3306 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000
     networks:
       default:
 
diff --git a/build/gitlab-dc.postgres.yml b/build/gitlab-dc.postgres.yml
index 48b2ff124e3..80d884bcf05 100644
--- a/build/gitlab-dc.postgres.yml
+++ b/build/gitlab-dc.postgres.yml
@@ -90,7 +90,7 @@ services:
       - elasticsearch
       - prometheus
       - grafana
-    command: postgres:5432 minio:9000 inbucket:10080 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000
+    command: postgres:5432 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000
     networks:
       default:
 
diff --git a/docker-compose.makefile.yml b/docker-compose.makefile.yml
index 8e5310efd02..eb10dc138e2 100644
--- a/docker-compose.makefile.yml
+++ b/docker-compose.makefile.yml
@@ -36,8 +36,8 @@ services:
     restart: 'no'
     container_name: mattermost-inbucket
     ports:
+      - "9001:9001"
       - "10025:10025"
-      - "10080:10080"
       - "10110:10110"
     extends:
         file: build/docker-compose.common.yml
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 5ad158d3d7f..61fb04b5a5d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -31,8 +31,8 @@ services:
   inbucket:
     container_name: mattermost-inbucket
     ports:
+      - "9001:9001"
       - "10025:10025"
-      - "10080:10080"
       - "10110:10110"
     extends:
         file: build/docker-compose.common.yml
@@ -95,7 +95,7 @@ services:
       - elasticsearch
       - prometheus
       - grafana
-    command: postgres:5432 mysql:3306 minio:9000 inbucket:10080 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000
+    command: postgres:5432 mysql:3306 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000
 
   leader:
     build:
diff --git a/shared/mail/inbucket.go b/shared/mail/inbucket.go
index b23f6182f33..b105a8899ea 100644
--- a/shared/mail/inbucket.go
+++ b/shared/mail/inbucket.go
@@ -183,7 +183,7 @@ func getInbucketHost() (host string) {
 
 	inbucket_port := os.Getenv("CI_INBUCKET_PORT")
 	if inbucket_port == "" {
-		inbucket_port = "10080"
+		inbucket_port = "9001"
 	}
 	return fmt.Sprintf("http://%s:%s", inbucket_host, inbucket_port)
 }