diff --git a/mongodb.yaml b/mongodb.yaml
index ad00865..4607c06 100644
--- a/mongodb.yaml
+++ b/mongodb.yaml
@@ -3,18 +3,20 @@ document: modulemd
 version: 2
 data:
     summary: MongoDB Module
-    description:  Mongo from humongous is a high-performance, open source, schema-free
-                  document-oriented database. MongoDB is written in C++ and offers the following features.
-                  Collection oriented storage, easy storage of object/JSON-style data.
-                  Dynamic queries.
-                  Full index support, including on inner objects and embedded arrays.
-                  Query profiling.
-                  Replication and fail-over support.
-                  Efficient storage of binary data including large objects (e.g. photos and videos).
-                  Auto-sharding for cloud-level scalability (currently in early alpha).
-                  Commercial Support Available.
-                  A key goal of MongoDB is to bridge the gap between key/value stores (which are fast and highly scalable)
-                  and traditional RDBMS systems (which are deep in functionality).
+    description: Mongo from humongous is a high-performance, open source,
+                 schema-free document-oriented database. MongoDB is written
+                 in C++ and offers the following features.
+                 Collection oriented storage, easy storage of object/JSON-style
+                 data. Dynamic queries. Full index support, including on inner
+                 objects and embedded arrays. Query profiling.
+                 Replication and fail-over support.
+                 Efficient storage of binary data including large objects
+                 (e.g. photos and videos).
+                 Auto-sharding for cloud-level scalability (currently in early
+                 alpha). Commercial Support Available.
+                 A key goal of MongoDB is to bridge the gap between key/value
+                 stores (which are fast and highly scalable) and
+                 traditional RDBMS systems (which are deep in functionality).
     license:
         module: [MIT]
     dependencies:
@@ -23,9 +25,9 @@ data:
         requires:
             platform: []
     references:
-         community: https://docs.pagure.org/modularity/
-         documentation: https://github.com/container-images/mongodb/
-         tracker: https://github.com/modularity-modules/mongodb
+        community: https://docs.pagure.org/modularity/
+        documentation: https://github.com/container-images/mongodb/
+        tracker: https://github.com/modularity-modules/mongodb
     profiles:
         default:
             rpms:
@@ -40,9 +42,9 @@ data:
                 - mongo-tools
     api:
         rpms:
-                - mongodb
-                - mongodb-server
-                - mongo-tools
+            - mongodb
+            - mongodb-server
+            - mongo-tools
     filter:
         rpms:
             - mongo-tools-devel
@@ -58,15 +60,20 @@ data:
                 rationale: MongoDB package.
                 ref: 3.6
                 buildorder: 2
+                # Not implemented yet - https://pagure.io/fm-orchestrator/issue/869 (hardcoded in mongodb spec)
+                arches: [ x86_64, ppc64le, aarch64, s390x ]
             python-pymongo:
                 rationale: Python MongoDB driver | MongoDB dependecy for running testsuite.
                 ref: f28
                 buildorder: 3
+                arches: [ x86_64, ppc64le, aarch64, s390x ]
             mongo-tools:
                 rationale: MongoDB tools.
                 ref: 3.6
                 buildorder: 2
+                arches: [ x86_64, ppc64le, aarch64, s390x ]
             mongo-java-driver:
                 rationale: Java driver for MongoDB.
                 ref: 3.6
                 buildorder: 2
+                arches: [ x86_64, ppc64le, aarch64, s390x ]