diff --git a/stable/mongodb-replicaset/Chart.yaml b/stable/mongodb-replicaset/Chart.yaml
index 523c4ef2f6..e55b1898e0 100644
--- a/stable/mongodb-replicaset/Chart.yaml
+++ b/stable/mongodb-replicaset/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: mongodb-replicaset
 home: https://github.com/mongodb/mongo
-version: 3.16.0
+version: 3.16.1
 appVersion: 3.6
 description: NoSQL document-oriented database that stores JSON-like documents with
   dynamic schemas, simplifying the integration of data in content-driven applications.
diff --git a/stable/mongodb-replicaset/install/Makefile b/stable/mongodb-replicaset/install/Makefile
index 1a9708558f..0383525d13 100644
--- a/stable/mongodb-replicaset/install/Makefile
+++ b/stable/mongodb-replicaset/install/Makefile
@@ -14,14 +14,12 @@
 
 all: push
 
-TAG = 0.7
+TAG = 0.8
 PREFIX = unguiculus/mongodb-install
+PLATFORM = linux/amd64,linux/arm/v7,linux/arm64/v8
 
 build:
-	docker build -t $(PREFIX):$(TAG) .
+	docker buildx build -t $(PREFIX):$(TAG) --platform $(PLATFORM) .
 
-push: build
-	docker push $(PREFIX):$(TAG)
-
-clean:
-	docker rmi $(PREFIX):$(TAG)
+push:
+	docker buildx build -t $(PREFIX):$(TAG) --platform $(PLATFORM) --push .