diff --git a/.github/workflows/e2e-max-dim.yml b/.github/workflows/e2e-max-dim.yml
index 97cc0b6ea1..36fe69eab2 100644
--- a/.github/workflows/e2e-max-dim.yml
+++ b/.github/workflows/e2e-max-dim.yml
@@ -65,7 +65,7 @@ jobs:
 
             sleep 3
 
-            kubectl rollout restart statefulset vald-agent-ngt
+            kubectl rollout restart statefulset vald-agent
 
             sleep 30
 
@@ -100,7 +100,7 @@ jobs:
           echo "MAX_BIT=${BIT}"
         env:
           DEFAULT_IMAGE_TAG: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }}
-          WAIT_FOR_SELECTOR: app=vald-agent-ngt
+          WAIT_FOR_SELECTOR: app=vald-agent
           WAIT_FOR_TIMEOUT: 29m
           VALUES: .github/helm/values/values-max-dim.yaml
         timeout-minutes: 60
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index f5e57d0838..5be11e64db 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -344,7 +344,7 @@ jobs:
         with:
           helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }}
           values: .github/helm/values/values-readreplica.yaml
-          wait_for_selector: app=vald-agent-ngt
+          wait_for_selector: app=vald-agent
 
       - name: Deploy Vald Read Replica
         id: deploy_vald_readreplica
diff --git a/Makefile.d/k8s.mk b/Makefile.d/k8s.mk
index ba6b023be4..a522123f70 100644
--- a/Makefile.d/k8s.mk
+++ b/Makefile.d/k8s.mk
@@ -111,6 +111,7 @@ k8s/vald/deploy:
 	@echo "Permitting error because there's some cases nothing to apply"
 	kubectl apply -f $(TEMP_DIR)/vald/templates/manager/index || true
 	kubectl apply -f $(TEMP_DIR)/vald/templates/agent || true
+	kubectl apply -f $(TEMP_DIR)/vald/templates/agent/ngt || true
 	kubectl apply -f $(TEMP_DIR)/vald/templates/agent/readreplica || true
 	kubectl apply -f $(TEMP_DIR)/vald/templates/discoverer || true
 	kubectl apply -f $(TEMP_DIR)/vald/templates/gateway || true
@@ -152,6 +153,7 @@ k8s/vald/delete:
 	kubectl delete -f $(TEMP_DIR)/vald/templates/manager/index
 	kubectl delete -f $(TEMP_DIR)/vald/templates/discoverer
 	kubectl delete -f $(TEMP_DIR)/vald/templates/agent/readreplica || true
+	kubectl delete -f $(TEMP_DIR)/vald/templates/agent/ngt || true
 	kubectl delete -f $(TEMP_DIR)/vald/templates/agent
 	kubectl delete -f $(TEMP_DIR)/vald/crds
 	rm -rf $(TEMP_DIR)
diff --git a/tests/e2e/crud/crud_test.go b/tests/e2e/crud/crud_test.go
index 237d33be2c..2e2593687f 100644
--- a/tests/e2e/crud/crud_test.go
+++ b/tests/e2e/crud/crud_test.go
@@ -790,8 +790,8 @@ func TestE2EIndexJobCorrection(t *testing.T) {
 	}
 
 	t.Log("Test case 2: execute index correction after one agent removed")
-	t.Log("removing vald-agent-ngt-0...")
-	cmd := exec.CommandContext(ctx, "sh", "-c", "kubectl delete pod vald-agent-ngt-0 && kubectl wait --for=condition=Ready pod/vald-agent-ngt-0")
+	t.Log("removing vald-agent-0...")
+	cmd := exec.CommandContext(ctx, "sh", "-c", "kubectl delete pod vald-agent-0 && kubectl wait --for=condition=Ready pod/vald-agent-0")
 	out, err := cmd.Output()
 	if err != nil {
 		if exitErr, ok := err.(*exec.ExitError); ok {
@@ -853,12 +853,12 @@ func TestE2EReadReplica(t *testing.T) {
 	sleep(t, waitAfterInsertDuration)
 
 	t.Log("starting to restart all the agent pods to make it backup index to pvc...")
-	if err := kubectl.RolloutResource(ctx, t, "statefulsets/vald-agent-ngt"); err != nil {
+	if err := kubectl.RolloutResource(ctx, t, "statefulsets/vald-agent"); err != nil {
 		t.Fatalf("failed to restart all the agent pods: %s", err)
 	}
 
 	t.Log("starting to create read replica rotators...")
-	pods, err := kubeClient.GetPods(ctx, namespace, "app=vald-agent-ngt")
+	pods, err := kubeClient.GetPods(ctx, namespace, "app=vald-agent")
 	if err != nil {
 		t.Fatalf("GetPods failed: %s", err)
 	}