diff --git a/solution-base/build.sh b/solution-base/build.sh
index 633c533fe0..85afcfbd04 100755
--- a/solution-base/build.sh
+++ b/solution-base/build.sh
@@ -37,6 +37,8 @@ MONGODB_SINGLE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-1-node.yaml
 MONGODB_THREE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-3-nodes.yaml
 MONGODB_SHARDED_SINGLE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-1-node.yaml
 MONGODB_SHARDED_THREE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-3-nodes.yaml
+MONGODB_SHARDED_SINGLE_NODE_THREE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-1-node-3-shards.yaml
+MONGODB_SHARDED_THREE_NODE_THREE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-3-nodes-3-shards.yaml
 
 SOLUTION_ENV='SOLUTION_ENV'
 
@@ -199,7 +201,9 @@ function render_mongodb_sharded_yamls()
 function mongodb_sharded_yamls()
 {
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_SINGLE_NODE_PATH}" 1 1
-    render_mongodb_sharded_yamls "${MONGODB_SHARDED_THREE_NODE_PATH}" 1 3 
+    render_mongodb_sharded_yamls "${MONGODB_SHARDED_THREE_NODE_PATH}" 1 3
+    render_mongodb_sharded_yamls "${MONGODB_SHARDED_SINGLE_NODE_THREE_SHARDS_PATH}" 3 1
+    render_mongodb_sharded_yamls "${MONGODB_SHARDED_THREE_NODE_THREE_SHARDS_PATH}" 3 3
 }
 
 function gen_manifest_yaml()
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
index 85e76e7b82..286af48935 100644
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
@@ -374,7 +374,9 @@ spec:
         {{- end }}
         {{- if $.Values.shardsvr.persistence.selector }}
         selector:
-{{ toYaml $.Values.shardsvr.persistence.selector | indent 10 }}
+          matchLabels:
+            shard: '{{ $i }}'
+{{ toYaml $.Values.shardsvr.persistence.selector.matchLabels | indent 12 }}
         {{- end }}
         resources:
           requests: