diff --git a/common_factories.py b/common_factories.py
index 09711ac4..834be0bc 100644
--- a/common_factories.py
+++ b/common_factories.py
@@ -454,16 +454,21 @@ def addGaleraTests(factory, mtrDbPool):
 
 
 def addS3Tests(factory, mtrDbPool):
+    runS3 = (
+        lambda props: hasS3(props)
+        and props.hasProperty("compile_step_completed")
+        and "10.5" not in str(props.getProperty("master_branch"))
+    )
     factory.addStep(
         steps.MasterShellCommand(
             name="Create minio S3 bucket",
+            alwaysRun=True,
             command=[
                 "mc",
                 "mb",
                 util.Interpolate("minio/%(prop:buildername)s-%(prop:buildnumber)s"),
             ],
-            doStepIf=lambda props: hasS3(props)
-            and props.hasProperty("compile_step_completed"),
+            doStepIf=runS3,
         )
     )
     factory.addStep(
@@ -491,7 +496,7 @@ def addS3Tests(factory, mtrDbPool):
             dbpool=mtrDbPool,
             autoCreateTables=True,
             env={
-                "S3_HOST_NAME": "135.181.42.57",
+                "S3_HOST_NAME": "minio.mariadb.org",
                 "S3_PORT": "443",
                 "S3_ACCESS_KEY": util.Interpolate("%(secret:minio_access_key)s"),
                 "S3_SECRET_KEY": util.Interpolate("%(secret:minio_secret_key)s"),
@@ -499,10 +504,9 @@ def addS3Tests(factory, mtrDbPool):
                     "%(prop:buildername)s-%(prop:buildnumber)s"
                 ),
                 "S3_USE_HTTP": "OFF",
-                "S3_SSL_NO_VERIFY": "ON",
+                "S3_PROTOCOL_VERSION": "Path",
             },
-            doStepIf=lambda props: hasS3(props)
-            and props.hasProperty("compile_step_completed"),
+            doStepIf=runS3,
         )
     )
 
@@ -516,8 +520,7 @@ def addS3Tests(factory, mtrDbPool):
                 "--force",
                 util.Interpolate("minio/%(prop:buildername)s-%(prop:buildnumber)s"),
             ],
-            doStepIf=lambda props: hasS3(props)
-            and props.hasProperty("compile_step_completed"),
+            doStepIf=runS3,
         )
     )
 
@@ -533,8 +536,7 @@ def addS3Tests(factory, mtrDbPool):
                     jobs=util.Property("jobs", default="$(getconf _NPROCESSORS_ONLN)"),
                 ),
             ],
-            doStepIf=lambda props: hasS3(props)
-            and props.hasProperty("compile_step_completed"),
+            doStepIf=runS3,
         )
     )
     return factory
diff --git a/constants.py b/constants.py
index 376cb912..39af5e9a 100644
--- a/constants.py
+++ b/constants.py
@@ -62,7 +62,7 @@
     "amd64-freebsd-14",
 ]
 builders_s3_mtr = [
-    "amd64-ubuntu-2004-debug",
+    "aarch64-ubuntu-2004-debug",
     "s390x-sles-1506",
 ]