diff --git a/.github/scripts/end2end/configs/zenko.yaml b/.github/scripts/end2end/configs/zenko.yaml
index 9ac52e9793..4ad9acee37 100644
--- a/.github/scripts/end2end/configs/zenko.yaml
+++ b/.github/scripts/end2end/configs/zenko.yaml
@@ -5,7 +5,7 @@ metadata:
   name: ${ZENKO_NAME}
   ${ZENKO_ANNOTATIONS}
     zenko.io/x-backbeat-oneshard-replicaset: data-db-mongodb-sharded-shard-0
-    zenko.io/x-backbeat-oneshard-replicaset-hosts: data-db-mongodb-sharded-shard0-data-0.data-db-mongodb-sharded-headless.default.svc.cluster.local:27017
+    zenko.io/x-backbeat-oneshard-replicaset-hosts: ${ZENKO_BACKBEAT_SHARD_HOSTS}
 spec:
   version: ${ZENKO_VERSION_NAME}
   replicas: 1
diff --git a/.github/scripts/end2end/deploy-zenko.sh b/.github/scripts/end2end/deploy-zenko.sh
index ec6d31ab8b..590ed6ce0f 100755
--- a/.github/scripts/end2end/deploy-zenko.sh
+++ b/.github/scripts/end2end/deploy-zenko.sh
@@ -17,6 +17,7 @@ export ZENKO_STS_INGRESS=${ZENKO_STS_INGRESS:-'sts.zenko.local'}
 export ZENKO_MANAGEMENT_INGRESS=${ZENKO_MANAGEMENT_INGRESS:-'management.zenko.local'}
 export ZENKO_S3_INGRESS=${ZENKO_S3_INGRESS:-'s3.zenko.local'}
 export ZENKO_UI_INGRESS=${ZENKO_UI_INGRESS:-'ui.zenko.local'}
+export MONGODB_SHARD_COUNT=${MONGODB_SHARD_COUNT:-1}
 
 export BACKBEAT_LCC_CRON_RULE=${BACKBEAT_LCC_CRON_RULE:-'*/5 * * * * *'}
 
@@ -128,7 +129,17 @@ create_encryption_secret()
     export AZURE_SECRET_KEY_ENCRYPTED
 }
 
+generate_shard_hosts() {
+    local hosts=""
+    for ((i=0; i<MONGODB_SHARD_COUNT; i++)); do
+        if [ $i -gt 0 ]; then hosts+=","; fi
+        hosts+="data-db-mongodb-sharded-shard${i}-data-0.data-db-mongodb-sharded-headless.default.svc.cluster.local:27017"
+    done
+    export ZENKO_BACKBEAT_SHARD_HOSTS="$hosts"
+}
+
 create_encryption_secret
+generate_shard_hosts
 
 env $(dependencies_env) envsubst < ${ZENKOVERSION_PATH} | kubectl -n ${NAMESPACE} apply -f -
 env $(dependencies_env) envsubst < ${ZENKO_CR_PATH} | kubectl -n ${NAMESPACE} apply -f -
diff --git a/.github/scripts/end2end/generate-kustomization.sh b/.github/scripts/end2end/generate-kustomization.sh
new file mode 100644
index 0000000000..ca98ff724e
--- /dev/null
+++ b/.github/scripts/end2end/generate-kustomization.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Constants for valid topologies for CI tests
+readonly VALID_TOPOLOGIES=(
+    "1:1" "1:2" "3:1" "3:3" "6:1" "6:3" "6:2" "6:6" "9:1" "9:3" "9:6" "9:9"
+)
+
+generate_kustomization() {
+    local node_count=$1
+    local shard_count=$2
+    local kustomization_file="${DIR}/kustomization.yaml"
+    local base_yaml="mongodb-sharded-${node_count}-node"
+
+    touch "$kustomization_file"
+
+    # Adjust file name if there are multiple shards
+    [[ "$shard_count" -gt 1 ]] && base_yaml="${base_yaml}-${shard_count}-shards"
+    base_yaml="${base_yaml}.yaml"
+
+    # Validate topology
+    local topology_key="${node_count}:${shard_count}"
+    [[ ! " ${VALID_TOPOLOGIES[*]} " =~ ${topology_key} ]] && {
+        echo "Error: Invalid topology - ${node_count} nodes, ${shard_count} shards"
+        exit 1
+    }
+
+    # Generate base kustomization file with the right base resource
+    cat > "$kustomization_file" << EOF
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ${DIR}/_build/root/deploy/${base_yaml}
+patchesStrategicMerge:
+EOF
+
+    # Add configsvr patch with correct path to add volumeClaimTemplates
+    cat >> "$kustomization_file" << EOF
+- |-
+  apiVersion: apps/v1
+  kind: StatefulSet
+  metadata:
+    name: data-db-mongodb-sharded-configsvr
+  spec:
+    volumeClaimTemplates:
+     - metadata:
+         name: datadir
+       spec:
+         accessModes:
+         - "ReadWriteOnce"
+         resources:
+           requests:
+             storage: "8Gi"
+         storageClassName: standard
+EOF
+
+    # Add shard patches for N shards with correct path to add volumeClaimTemplates
+    for ((i=0; i<shard_count; i++)); do
+        cat >> "$kustomization_file" << EOF
+- |-
+  apiVersion: apps/v1
+  kind: StatefulSet
+  metadata:
+    name: data-db-mongodb-sharded-shard${i}-data
+  spec:
+    volumeClaimTemplates:
+     - metadata:
+         name: datadir
+       spec:
+         accessModes:
+         - "ReadWriteOnce"
+         resources:
+           requests:
+             storage: "8Gi"
+         storageClassName: standard
+EOF
+    done
+}
diff --git a/.github/scripts/end2end/install-kind-dependencies.sh b/.github/scripts/end2end/install-kind-dependencies.sh
index 4300063488..32e1f6709f 100755
--- a/.github/scripts/end2end/install-kind-dependencies.sh
+++ b/.github/scripts/end2end/install-kind-dependencies.sh
@@ -24,6 +24,10 @@ MONGODB_APP_PASSWORD=datapass
 MONGODB_APP_DATABASE=${ZENKO_MONGODB_DATABASE:-datadb}
 MONGODB_RS_KEY=0123456789abcdef
 
+MONGODB_SHARD_COUNT=${MONGODB_SHARD_COUNT:-1}
+
+source "${DIR}/generate-kustomization.sh" && generate_kustomization "${NODE_COUNT:-1}" "${MONGODB_SHARD_COUNT}"
+
 ENABLE_KEYCLOAK_HTTPS=${ENABLE_KEYCLOAK_HTTPS:-'false'}
 
 KAFKA_CHART=banzaicloud-stable/kafka-operator
@@ -186,7 +190,7 @@ mongodb_wait_for_shards() {
             --eval "db.runCommand({ listshards: 1 }).shards.length"
     )
 
-    [ $count == "1" ]
+    [ $count == "$MONGODB_SHARD_COUNT" ]
 }
 
 mongodb_sharded() {
@@ -197,11 +201,14 @@ mongodb_sharded() {
         $SOLUTION_REGISTRY/os-shell=$(get_image_from_deps mongodb-shell) \
         $SOLUTION_REGISTRY/mongodb-exporter=$(get_image_from_deps mongodb-sharded-exporter)
 
-    kubectl apply -k .
+    kubectl apply -k "${DIR}"
 
-    kubectl rollout status statefulset data-db-mongodb-sharded-mongos
-    kubectl rollout status statefulset data-db-mongodb-sharded-configsvr
-    kubectl rollout status statefulset data-db-mongodb-sharded-shard0-data
+    kubectl rollout status statefulset data-db-mongodb-sharded-mongos --timeout=5m
+    kubectl rollout status statefulset data-db-mongodb-sharded-configsvr --timeout=5m
+
+    for ((i=0; i<MONGODB_SHARD_COUNT; i++)); do
+        kubectl rollout status statefulset "data-db-mongodb-sharded-shard${i}-data" --timeout=5m
+    done
 
     retry mongodb_wait_for_shards "no shards found"
 
diff --git a/.github/scripts/end2end/kustomization.yaml b/.github/scripts/end2end/kustomization.yaml
deleted file mode 100644
index 34df6aa9f4..0000000000
--- a/.github/scripts/end2end/kustomization.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- ./_build/root/deploy/mongodb-sharded-1-node.yaml
-patchesStrategicMerge:
-- |-
-  apiVersion: apps/v1
-  kind: StatefulSet
-  metadata:
-    name: data-db-mongodb-sharded-configsvr
-  spec:
-    volumeClaimTemplates:
-     - metadata:
-         name: datadir
-         annotations:
-       spec:
-         accessModes:
-         - "ReadWriteOnce"
-         resources:
-           requests:
-             storage: "8Gi"
-         storageClassName: standard
-- |-
-  apiVersion: apps/v1
-  kind: StatefulSet
-  metadata:
-    name: data-db-mongodb-sharded-shard0-data
-  spec:
-    volumeClaimTemplates:
-     - metadata:
-         name: datadir
-         annotations:
-       spec:
-         accessModes:
-         - "ReadWriteOnce"
-         resources:
-           requests:
-             storage: "8Gi"
-         storageClassName: standard
diff --git a/.github/workflows/end2end.yaml b/.github/workflows/end2end.yaml
index e2b88a9768..9ded0d7b0d 100644
--- a/.github/workflows/end2end.yaml
+++ b/.github/workflows/end2end.yaml
@@ -639,6 +639,48 @@ jobs:
       - name: Clean Up
         run: kind delete cluster
 
+  end2end-sharded-2-shards:
+    needs: [build-kafka]
+    runs-on:
+      - ubuntu-22.04-8core
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        uses: ./.github/actions/install-end2end-dependencies
+      - name: Wait for Docker daemon to be ready
+        uses: ./.github/actions/wait-docker-ready
+      - name: Kubectl tool installer
+        uses: Azure/setup-kubectl@v4
+      - name: Login to Registry
+        uses: docker/login-action@v3
+        with:
+          username: "${{ github.repository_owner }}"
+          password: "${{ github.token }}"
+          registry: ghcr.io
+      - name: Deploy Zenko
+        uses: ./.github/actions/deploy
+        env:
+          GIT_ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }}
+          ZENKO_ENABLE_SOSAPI: true
+          TIME_PROGRESSION_FACTOR: 86400
+          TRANSITION_ONE_DAY_EARLIER: false
+          EXPIRE_ONE_DAY_EARLIER: false
+          MONGODB_SHARD_COUNT: 2
+      - name: Debug wait
+        uses: ./.github/actions/debug-wait
+        timeout-minutes: 60
+        if: failure() && runner.debug == '1'
+      - name: Archive and publish artifacts
+        uses: ./.github/actions/archive-artifacts
+        with:
+          user: ${{ secrets.ARTIFACTS_USER }}
+          password: ${{ secrets.ARTIFACTS_PASSWORD }}
+          trunk_token: ${{ secrets.TRUNK_TOKEN }}
+        if: always()
+      - name: Clean Up
+        run: kind delete cluster
+
   write-final-status:
     runs-on: ubuntu-latest
     needs:
@@ -652,6 +694,7 @@ jobs:
       - end2end-http
       - end2end-https
       - end2end-sharded
+      - end2end-sharded-2-shards
       - end2end-pra
       - ctst-end2end-sharded
     steps:
diff --git a/solution-base/build.sh b/solution-base/build.sh
index 98feca9e62..6c78719d43 100755
--- a/solution-base/build.sh
+++ b/solution-base/build.sh
@@ -30,6 +30,7 @@ SKOPEO_OPTS="--override-os linux --insecure-policy"
 SOLUTION_REGISTRY=metalk8s-registry-from-config.invalid/${PRODUCT_LOWERNAME}-${VERSION_FULL}
 
 MONGODB_SHARDED_SINGLE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-1-node.yaml
+MONGODB_SHARDED_SINGLE_NODE_TWO_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-1-node-2-shards.yaml
 MONGODB_SHARDED_THREE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-3-nodes.yaml
 MONGODB_SHARDED_THREE_NODE_THREE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-3-nodes-3-shards.yaml
 MONGODB_SHARDED_SIX_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-6-nodes.yaml
@@ -130,6 +131,7 @@ 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_SINGLE_NODE_TWO_SHARDS_PATH}" 2 1
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_THREE_NODE_PATH}" 1 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_THREE_NODE_THREE_SHARDS_PATH}" 3 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_SIX_NODE_PATH}" 1 6