diff --git a/Taskfile.yaml b/Taskfile.yaml
index 76d664fdb5..23feb5b706 100644
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -151,29 +151,29 @@ tasks:
       - task: cve:bin
       - tools/cve/scan-main.sh {{.REPORT_FILE_NAME}}
 
-  dlv:virt-handler:build:
-    desc: "Build image virt-handler with dlv"
-    cmd: docker build -f ./images/virt-handler/debug/dlv.Dockerfile -t "{{ .DLV_IMAGE }}" --platform linux/amd64 .
+  dlv:virt-controller:build:
+    desc: "Build image virt-controller with dlv"
+    cmd: docker build -f ./images/virt-controller/debug/dlv.Dockerfile -t "{{ .DLV_IMAGE }}" .
 
-  dlv:virt-handler:build-push:
-    desc: "Build and Push image virt-handler with dlv"
+  dlv:virt-controller:build-push:
+    desc: "Build and Push image virt-controller with dlv"
     cmds:
-      - task: dlv:virt-handler:build
+      - task: dlv:virt-controller:build
       - docker push "{{ .DLV_IMAGE }}"
-      - task: dlv:virt-handler:print
+      - task: dlv:virt-controller:print
 
-  dlv:virt-handler:print:
+  dlv:virt-controller:print:
     desc: "Print commands for debug"
     env:
       IMAGE: "{{ .DLV_IMAGE }}"
     cmd: |
       cat <<EOF
-      kubectl -n d8-virtualization patch ds virt-handler --type='strategic' -p '{
+      kubectl -n d8-virtualization patch deploy virt-controller --type='strategic' -p '{
         "spec": {
           "template": {
             "spec": {
               "containers": [ {
-                "name": "virt-handler",
+                "name": "virt-controller",
                 "image": "${IMAGE}",
                 "ports": [ { "containerPort": 2345, "name": "dlv" } ]
               }]
@@ -181,32 +181,32 @@ tasks:
           }
         }
       }'
-      kubectl -n d8-virtualization port-forward pod/<virt-handler-pod> 2345:2345
+      kubectl -n d8-virtualization port-forward deploy/virt-controller 2345:2345
       EOF
 
-  dlv:virt-controller:build:
-    desc: "Build image virt-controller with dlv"
-    cmd: docker build -f ./images/virt-controller/debug/dlv.Dockerfile -t "{{ .DLV_IMAGE }}" .
+  dlv:virt-handler:build:
+    desc: "Build image virt-handler with dlv"
+    cmd: docker build -f ./images/virt-handler/debug/dlv.Dockerfile -t "{{ .DLV_IMAGE }}" --platform linux/amd64 .
 
-  dlv:virt-controller:build-push:
-    desc: "Build and Push image virt-controller with dlv"
+  dlv:virt-handler:build-push:
+    desc: "Build and Push image virt-handler with dlv"
     cmds:
-      - task: dlv:virt-controller:build
+      - task: dlv:virt-handler:build
       - docker push "{{ .DLV_IMAGE }}"
-      - task: dlv:virt-controller:print
+      - task: dlv:virt-handler:print
 
-  dlv:virt-controller:print:
+  dlv:virt-handler:print:
     desc: "Print commands for debug"
     env:
       IMAGE: "{{ .DLV_IMAGE }}"
     cmd: |
       cat <<EOF
-      kubectl -n d8-virtualization patch deploy virt-controller --type='strategic' -p '{
+      kubectl -n d8-virtualization patch ds virt-handler --type='strategic' -p '{
         "spec": {
           "template": {
             "spec": {
               "containers": [ {
-                "name": "virt-controller",
+                "name": "virt-handler",
                 "image": "${IMAGE}",
                 "ports": [ { "containerPort": 2345, "name": "dlv" } ]
               }]
@@ -214,5 +214,5 @@ tasks:
           }
         }
       }'
-      kubectl -n d8-virtualization port-forward deploy/virt-controller 2345:2345
+      kubectl -n d8-virtualization port-forward pod/<virt-handler-pod> 2345:2345
       EOF