diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index 435e4db1..289f6f5f 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -568,7 +568,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test: ["sanity", "state_transitions", "state_transitions_both_gws", "state_transitions_loop", "state_transitions_rand_loop"]
+        test: ["sanity", "state_transitions", "state_transitions_both_gws", "state_transitions_loop", "state_transitions_rand_loop", "late_registration", "late_registration_loop"]
     runs-on: ubuntu-latest
     env:
       HUGEPAGES: 768  # 3 spdk instances
diff --git a/tests/ha/late_registration.sh b/tests/ha/late_registration.sh
new file mode 100755
index 00000000..be4d2014
--- /dev/null
+++ b/tests/ha/late_registration.sh
@@ -0,0 +1,122 @@
+set -xe
+rpc=/usr/libexec/spdk/scripts/rpc.py
+cmd=nvmf_subsystem_get_listeners
+nqn=nqn.2016-06.io.spdk:cnode1
+
+expect_optimized() {
+  GW_NAME=$1
+  EXPECTED_OPTIMIZED=$2
+
+  socket=$(docker exec "$GW_NAME" find /var/run/ceph -name spdk.sock)
+  # Verify expected number of "optimized"
+  while true; do
+    response=$(docker exec "$GW_NAME" "$rpc" "-s" "$socket" "$cmd" "$nqn")
+    ana_states=$(echo "$response" | jq -r '.[0].ana_states')
+
+    # Count the number of "optimized" groups
+    optimized_count=$(jq -nr --argjson ana_states "$ana_states" '$ana_states | map(select(.ana_state == "optimized")) | length')
+
+    # Check if there is expected number of "optimized" group
+    if [ "$optimized_count" -eq "$EXPECTED_OPTIMIZED" ]; then
+      # Iterate through JSON array
+      for item in $(echo "$ana_states" | jq -c '.[]'); do
+        ana_group=$(echo "$item" | jq -r '.ana_group')
+        ana_state=$(echo "$item" | jq -r '.ana_state')
+
+        # Check if ana_state is "optimized"
+        if [ "$ana_state" = "optimized" ]; then
+          echo "$ana_group"
+        fi
+      done
+      break
+    else
+      sleep 1
+      continue
+    fi
+  done
+}
+
+# GW name by index
+gw_name() {
+  i=$1
+  docker ps --format '{{.ID}}\t{{.Names}}' | awk '$2 ~ /nvmeof/ && $2 ~ /'$i'/ {print $1}'
+}
+
+# Function to access numbers by index
+access_number_by_index() {
+    numbers=$1
+    index=$(expr $2 + 1)
+    number=$(echo "$numbers" | awk -v idx="$index" 'NR == idx {print}')
+    echo "$number"
+}
+
+# verify that given numbers must be either 1 and 2 or 2 and 1
+verify_ana_groups() {
+    nr1=$1
+    nr2=$2
+
+    if [ "$nr1" -eq 1 ] && [ "$nr2" -eq 2 ]; then
+        echo "Verified: first is 1 and second is 2"
+    elif [ "$nr1" -eq 2 ] && [ "$nr2" -eq 1 ]; then
+        echo "Verified: first is 2 and second is 1"
+    else
+        echo "Invalid numbers: first and second must be either 1 and 2 or 2 and 1"
+        exit 1
+    fi
+}
+
+random_sleep() {
+    # Generate a random number between 0 and 59
+    seconds=$(( RANDOM % 60 ))
+
+    # Sleep for the random number of seconds
+    echo "Sleeping for $seconds secs"
+    sleep "$seconds"
+}
+
+#
+# MAIN
+#
+
+# Step 1 Stop the existing deployement
+make down
+
+# Step 2 Start a new deployment
+docker-compose up -d --scale nvmeof=2 nvmeof
+
+# Step 3 Wait for ceph container to become healthy"
+while true; do
+  container_status=$(docker inspect --format='{{.State.Health.Status}}' ceph)
+  if [[ $container_status == "healthy" ]]; then
+    # success
+    break
+  else
+    # Wait for a specific time before checking again
+    sleep 1
+    echo -n .
+  fi
+done
+docker ps
+
+# Step 4 random sleep
+random_sleep
+
+# Step 5 Send nvme-gw create for both gateways
+for i in $(seq 2); do
+  GW_NAME=$(docker ps --format '{{.ID}}\t{{.Names}}' | awk '$2 ~ /nvmeof/ && $2 ~ /'$i'/ {print $1}')
+  docker-compose exec -T ceph ceph nvme-gw create $GW_NAME rbd ''
+done
+
+
+#
+# Step 6 validate both gateways are optimized for one of ANA groups 1 and 2
+#
+GW1_NAME=$(gw_name 1)
+GW2_NAME=$(gw_name 2)
+GW1_OPTIMIZED=$(expect_optimized $GW1_NAME 1)
+gw1_ana=$(access_number_by_index "$GW1_OPTIMIZED" 0)
+
+GW2_OPTIMIZED=$(expect_optimized $GW2_NAME 1)
+gw2_ana=$(access_number_by_index "$GW2_OPTIMIZED" 0)
+
+verify_ana_groups "$gw1_ana" "$gw2_ana"
diff --git a/tests/ha/late_registration_loop.sh b/tests/ha/late_registration_loop.sh
new file mode 100755
index 00000000..35164a81
--- /dev/null
+++ b/tests/ha/late_registration_loop.sh
@@ -0,0 +1,12 @@
+# Check if GITHUB_WORKSPACE is defined
+if [ -n "$GITHUB_WORKSPACE" ]; then
+    test_dir="$GITHUB_WORKSPACE/tests/ha"
+else
+    test_dir=$(dirname $0)
+fi
+
+ITERATIONS=7
+for i in $(seq $ITERATIONS); do
+  echo "Iteration #$i"
+  source $test_dir/late_registration.sh
+done