diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1570,6 +1570,24 @@
                         '-DLLVM_LIT_ARGS=-vj 4',
                     ])},
 
+    {'name' : "mlir-s390x-linux-werror",
+    'tags'  : ["mlir", "s390x"],
+    'workernames' : ["onnx-mlir-nowarn-linux-s390x"],
+    'builddir': "onnx-mlir-nowarn-linux-s390x",
+    'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
+                    clean=True,
+                    checks = ['check-mlir'],
+                    targets = ['check-mlir-build-only'],
+                    depends_on_projects=['llvm','mlir'],
+                    extra_configure_args=[
+                        "-DCMAKE_BUILD_TYPE=Release",
+                        "-DLLVM_ENABLE_PROJECTS=mlir",
+                        "-DLLVM_ENABLE_ASSERTIONS=ON",
+                        "-DLLVM_ENABLE_RTTI=ON",
+                        "-DLLVM_ENABLE_WERROR=ON",
+                        "-DLLVM_TARGETS_TO_BUILD=host",
+                    ])},
+
 # Sanitizer builders.
 #
 # bootstrap-asan, bootstrap-msan, and sanitizer-x86_64-linux-fast have steps
diff --git a/buildbot/osuosl/master/config/status.py b/buildbot/osuosl/master/config/status.py
--- a/buildbot/osuosl/master/config/status.py
+++ b/buildbot/osuosl/master/config/status.py
@@ -153,6 +153,13 @@
         subject = "Build %(builder)s Failure",
         mode = "failing",
         builders = ["mlir-windows"]),
+    reporters.MailNotifier(
+        fromaddr = "llvm.buildmaster@lab.llvm.org",
+        sendToInterestedUsers = False,
+        extraRecipients = ["gongsu@us.ibm.com", "alexe@us.ibm.com"],
+        subject = "Build %(builder)s Failure",
+        mode = "failing",
+        builders = ["mlir-s390x-linux-werror"]),
     reporters.MailNotifier(
         fromaddr = "llvm.buildmaster@lab.llvm.org",
         sendToInterestedUsers = False,
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -66,6 +66,9 @@
         # Windows Server 2016 Intel(R) Xeon(R) CPU @ 2.60GHz, 16 Core(s), 128 GB of RAM
         create_worker("win-mlir-buildbot", properties={'jobs' : 64}, max_builds=1),
 
+        # Linux s390x Ubuntu Focal, IBM z13 (5GHz), 64GB of RAM
+        create_worker("onnx-mlir-nowarn-linux-s390x", properties={'jobs' : 4}, max_builds=1),
+
         # LoongArch64 Loongson-3C5000L-LL 2GHz, 128GB of RAM
         # CLFS repo: https://github.com/sunhaiyong1978/CLFS-for-LoongArch
         create_worker("loongson-loongarch64-clfs-clang-01", properties={'jobs': 32}, max_builds=1),