diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py
index dafd2258ef3..25c104376d3 100755
--- a/buildscripts/packager_enterprise.py
+++ b/buildscripts/packager_enterprise.py
@@ -130,7 +130,7 @@ class EnterpriseDistro(packager.Distro):
             if self.dname == 'suse':
                 return ["suse11", "suse12"]
             if self.dname == 'ubuntu':
-                return ["ubuntu1604"]
+                return ["ubuntu1604", "ubuntu1804"]
             return []
         if arch == "arm64":
             if self.dname == 'ubuntu':
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 275d056e991..da71a381a76 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -9657,6 +9657,220 @@ buildvariants:
     distros:
     - ubuntu1604-test
 
+- name: ubuntu1804-s390x
+  display_name: SSL Ubuntu 18.04 s390x
+  run_on:
+  - ubuntu1804-zseries-test
+  batchtime: 10080 # 7 days
+  expansions:
+    push_path: linux
+    push_bucket: downloads.mongodb.org
+    push_name: linux
+    push_arch: s390x-ubuntu1804
+    compile_flags: --ssl MONGO_DISTMOD=ubuntu1804 --release --jlink=3 -j$(grep -c ^processor /proc/cpuinfo) CCFLAGS="-march=z196 -mtune=zEC12" --variables-files=etc/scons/mongodbtoolchain_gcc.vars
+    multiversion_platform: ubuntu1804
+    multiversion_edition: targeted
+    multiversion_architecture: s390x
+    has_packages: true
+    packager_script: packager.py
+    packager_arch: s390x
+    packager_distro: ubuntu1804
+    repo_edition: org
+    scons_cache_scope: local
+    tooltags: "ssl"
+    build_mongoreplay: true
+  display_tasks:
+  - *dbtest
+  - *unittests
+  tasks:
+  - name: compile_all_run_unittests_TG
+    distros:
+    - ubuntu1804-zseries-build
+  - name: aggregation
+  - name: aggregation_auth
+  - name: auth
+  - name: disk_wiredtiger
+  - name: failpoints
+  - name: failpoints_auth
+  - name: free_monitoring
+  - name: gle_auth
+  - name: gle_auth_write_cmd
+  - name: gle_auth_write_cmd
+  - name: gle_auth_basics_passthrough
+  - name: gle_auth_basics_passthrough_write_cmd
+  - name: sharding_gle_auth_basics_passthrough
+  - name: sharding_gle_auth_basics_passthrough_write_cmd
+  - name: jsCore
+  - name: jsCore_auth
+  - name: jsCore_compatibility
+  - name: jsCore_decimal
+  - name: jsCore_txns
+  - name: aggregation_wildcard_fuzzer_gen
+  - name: jstestfuzz_gen
+  - name: jstestfuzz_concurrent_gen
+  - name: jstestfuzz_concurrent_replication_gen
+  - name: jstestfuzz_concurrent_sharded_gen
+  - name: jstestfuzz_replication_gen
+  - name: jstestfuzz_sharded_gen
+  - name: mongosTest
+  - name: noPassthrough
+  - name: noPassthroughWithMongod
+  - name: bulk_gle_passthrough
+  - name: parallel
+  - name: parallel_compatibility
+  - name: concurrency
+  - name: concurrency_replication
+  - name: concurrency_replication_causal_consistency
+    distros:
+    - ubuntu1804-zseries-build
+  - name: concurrency_replication_multi_stmt_txn
+  - name: concurrency_sharded_replication
+  - name: concurrency_sharded_replication_with_balancer
+  - name: concurrency_simultaneous
+  - name: concurrency_simultaneous_replication
+  - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
+  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
+  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
+  - name: replica_sets
+  - name: replica_sets_auth
+  - name: replica_sets_jscore_passthrough
+  - name: sharding
+  - name: sharding_auth
+  - name: slow1
+  - name: serial_run
+  - name: sharded_causally_consistent_jscore_txns_passthrough
+  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
+  - name: sharded_jscore_txns
+  - name: sharded_jscore_txns_sharded_collections
+  - name: sharding_jscore_passthrough
+  - name: ssl
+  - name: sslSpecial
+  - name: tool
+  - name: publish_packages
+    distros:
+    - ubuntu1804-test
+  - name: push
+    distros:
+    - ubuntu1804-test
+
+- name: enterprise-ubuntu1804-s390x
+  display_name: Enterprise Ubuntu 18.04 s390x
+  modules:
+  - enterprise
+  run_on:
+  - ubuntu1804-zseries-test
+  batchtime: 10080 # 7 days
+  stepback: false
+  expansions:
+    push_path: linux
+    push_bucket: downloads.10gen.com
+    push_name: linux
+    push_arch: s390x-enterprise-ubuntu1804
+    compile_flags: --ssl MONGO_DISTMOD=ubuntu1804 --release --jlink=3 -j$(grep -c ^processor /proc/cpuinfo) CCFLAGS="-march=z196 -mtune=zEC12" --variables-files=etc/scons/mongodbtoolchain_gcc.vars
+    resmoke_jobs_max: 2
+    has_packages: true
+    packager_script: packager_enterprise.py
+    packager_arch: s390x
+    packager_distro: ubuntu1804
+    repo_edition: enterprise
+    tooltags: "ssl sasl"
+    build_mongoreplay: true
+    multiversion_platform: ubuntu1804
+    multiversion_architecture: s390x
+    multiversion_edition: enterprise
+    scons_cache_scope: local
+  display_tasks:
+  - *dbtest
+  - *unittests
+  tasks:
+  - name: compile_all_run_unittests_TG
+    distros:
+    - ubuntu1804-zseries-build
+  - name: aggregation
+  - name: aggregation_ese
+  - name: aggregation_auth
+  - name: aggregation_read_concern_majority_passthrough
+  - name: aggregation_sharded_collections_passthrough
+  - name: audit
+  - name: auth
+  - name: auth_audit
+  - name: bulk_gle_passthrough
+  - name: concurrency
+  - name: concurrency_replication
+  - name: concurrency_replication_causal_consistency
+  - name: concurrency_replication_multi_stmt_txn
+  - name: concurrency_sharded_replication
+  - name: concurrency_sharded_replication_with_balancer
+  - name: concurrency_simultaneous
+  - name: concurrency_simultaneous_replication
+  - name: ese
+  - name: failpoints
+  - name: failpoints_auth
+  - name: gle_auth
+  - name: gle_auth_basics_passthrough
+  - name: gle_auth_basics_passthrough_write_cmd
+  - name: gle_auth_write_cmd
+  - name: integration_tests_replset
+  - name: integration_tests_sharded
+  - name: integration_tests_standalone
+  - name: jsCore
+  - name: jsCore_ese
+  - name: jsCore_compatibility
+  - name: jsCore_decimal
+  - name: jsCore_op_query
+  - name: jsCore_txns
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: jstestfuzz_gen
+  - name: jstestfuzz_concurrent_gen
+  - name: jstestfuzz_concurrent_replication_gen
+  - name: jstestfuzz_concurrent_sharded_gen
+  - name: jstestfuzz_replication_gen
+  - name: jstestfuzz_sharded_gen
+  - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
+  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
+  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
+  - name: mongosTest
+  - name: noPassthroughWithMongod
+  - name: noPassthrough
+  - name: parallel
+  - name: parallel_compatibility
+  - name: read_concern_linearizable_passthrough
+  - name: read_concern_majority_passthrough
+  - name: replica_sets
+  - name: replica_sets_ese
+  - name: replica_sets_auth
+  - name: replica_sets_jscore_passthrough
+  - name: sasl
+  - name: sharded_causally_consistent_jscore_txns_passthrough
+  - name: sharded_collections_causally_consistent_jscore_txns_passthrough
+  - name: sharded_collections_jscore_passthrough
+  - name: sharded_jscore_txns
+  - name: sharded_jscore_txns_sharded_collections
+  - name: sharding
+  - name: sharding_ese
+  - name: sharding_auth
+  - name: sharding_auth_audit
+  - name: sharding_csrs_continuous_config_stepdown
+  - name: sharding_gle_auth_basics_passthrough
+  - name: sharding_gle_auth_basics_passthrough_write_cmd
+  - name: sharding_jscore_passthrough
+  - name: sharding_jscore_op_query_passthrough
+  - name: sharding_jscore_passthrough_wire_ops
+  - name: sharding_op_query
+  - name: slow1
+  - name: serial_run
+  - name: snmp
+  - name: ssl
+  - name: sslSpecial
+  - name: tool
+  - name: write_concern_majority_passthrough
+  - name: publish_packages
+    distros:
+    - ubuntu1804-test
+  - name: push
+    distros:
+    - ubuntu1804-test
+
 - name: enterprise-linux-64-amazon-ami
   display_name: "Enterprise Amazon Linux"
   modules:
diff --git a/etc/repo_config.yaml b/etc/repo_config.yaml
index f2c25632162..e04d68b80b2 100644
--- a/etc/repo_config.yaml
+++ b/etc/repo_config.yaml
@@ -199,6 +199,7 @@ repos:
     architectures:
       - amd64
       - i386
+      - s390x
     repos:
       - apt/ubuntu/dists/bionic/mongodb-org
 
@@ -367,5 +368,6 @@ repos:
     architectures:
       - amd64
       - i386
+      - s390x
     repos:
       - apt/ubuntu/dists/bionic/mongodb-enterprise