diff --git a/.github/workflows/build-opensearch-image.yml b/.github/workflows/build-opensearch-image.yml
new file mode 100644
index 00000000000..a0beca9ed44
--- /dev/null
+++ b/.github/workflows/build-opensearch-image.yml
@@ -0,0 +1,33 @@
+name: Opensearch Docker Image
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - server/build/Dockerfile.opensearch
+      - .github/workflows/build-opensearch-image.yml
+
+jobs:
+  build-image:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: opensearch/checkout-repo
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: opensearch/docker-login
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_DEV_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_DEV_TOKEN }}
+
+      - name: opensearch/build-and-push
+        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
+        with:
+          provenance: false
+          file: server/build/Dockerfile.opensearch
+          push: true
+          pull: true
+          tags: mattermostdevelopment/mattermost-opensearch:2.7.0
+          build-args:
+          - OPENSEARCH_VERSION=2.7.0
diff --git a/server/build/Dockerfile.opensearch b/server/build/Dockerfile.opensearch
index f6f0aa36355..fe3a44bab5e 100644
--- a/server/build/Dockerfile.opensearch
+++ b/server/build/Dockerfile.opensearch
@@ -1,3 +1,4 @@
-FROM opensearchproject/opensearch:2.7.0
+ARG OPENSEARCH_VERSION=2.7.0
+FROM opensearchproject/opensearch:$OPENSEARCH_VERSION
 
 RUN /usr/share/opensearch/bin/opensearch-plugin install analysis-icu
diff --git a/server/scripts/mirror-docker-images.json b/server/scripts/mirror-docker-images.json
index f98afd72cea..15e32b112ff 100644
--- a/server/scripts/mirror-docker-images.json
+++ b/server/scripts/mirror-docker-images.json
@@ -4,10 +4,15 @@
     "12": "postgres:12@sha256:cc7a021d9aff3aa02788d35c27a5cc32d4790ad92d72232a6be75b76ab7d79db"
   },
   "mysql": {
-    "5.7.12": "mysql/mysql-server:5.7.12@sha256:3f0d90736a3298bb04965db697a3a85f1df1480da49eafd256be1ea2b9b5337e"
+    "5.7.12": "mysql/mysql-server:5.7.12@sha256:3f0d90736a3298bb04965db697a3a85f1df1480da49eafd256be1ea2b9b5337e",
+    "8.0.32": "mysql/mysql-server:8.0.32@sha256:d6c8301b7834c5b9c2b733b10b7e630f441af7bc917c74dba379f24eeeb6a313"
   },
   "minio": {
-    "RELEASE.2019-10-11T00-38-09Z-1": "minio/minio:RELEASE.2019-10-11T00-38-09Z@sha256:0d02f16a1662653f9b961211b21ed7de04bf04492f44c2b7594bacbfcc519eb5"
+    "RELEASE.2019-10-11T00-38-09Z-1": "minio/minio:RELEASE.2019-10-11T00-38-09Z@sha256:0d02f16a1662653f9b961211b21ed7de04bf04492f44c2b7594bacbfcc519eb5",
+    "RELEASE.2024-06-22T05-26-45Z": "minio/minio:RELEASE.2024-06-22T05-26-45Z@sha256:dda5e13d3df07fae2c1877701998742bcbe3bbb2b9c24c18ed5b9469cc777761"
+  },
+  "redis": {
+    "7.4.0": "redis:7.4.0@sha256:6725a7dc7a44a6486b9d0a5172b10ccaf0c2ea600df87c0b93450d0e7769297f"
   },
   "inbucket": {
     "3.0.0": "inbucket/inbucket:3.0.0@sha256:1f10a0efea694592c06799c729aee1d6d71c9a4f72b73031d4a426ef5f26dfc1"