diff --git a/.github/actions/build-image-action/action.yml b/.github/actions/build-image-action/action.yml
index 9a39fbbce..737b019bf 100644
--- a/.github/actions/build-image-action/action.yml
+++ b/.github/actions/build-image-action/action.yml
@@ -84,8 +84,12 @@ runs:
           echo "Creating Kind cluster"
           
           if [[ "${{ inputs.runs_on }}" == "hostname:model-server" ]]; then
+            # Ensure clean etcd directory for mounting
+            rm -rf /datadrive/etcd/*
             config_file=".github/workflows/kind-cluster/kind.yaml"
           else
+            # Ensure clean etcd directory for mounting
+            rm -rf /mnt/storage/etcd/*
             config_file=".github/workflows/kind-cluster/kind-1es.yaml"
           fi