diff --git a/manifests/kubernetes/kubevirt-tekton-tasks-kubernetes.yaml b/manifests/kubernetes/kubevirt-tekton-tasks-kubernetes.yaml
index b09a56071..5cfa61c13 100644
--- a/manifests/kubernetes/kubevirt-tekton-tasks-kubernetes.yaml
+++ b/manifests/kubernetes/kubevirt-tekton-tasks-kubernetes.yaml
@@ -444,8 +444,6 @@ spec:
           value: direct
         - name: LIBGUESTFS_PATH
           value: /mnt/appliance
-      securityContext:
-        runAsUser: 0
       resources:
         limits:
           devices.kubevirt.io/kvm: '1'
@@ -513,8 +511,6 @@ spec:
           value: direct
         - name: LIBGUESTFS_PATH
           value: /mnt/appliance
-      securityContext:
-        runAsUser: 0
       resources:
         limits:
           devices.kubevirt.io/kvm: '1'
diff --git a/manifests/okd/kubevirt-tekton-tasks-okd.yaml b/manifests/okd/kubevirt-tekton-tasks-okd.yaml
index 8cb42af86..afe2be7b7 100644
--- a/manifests/okd/kubevirt-tekton-tasks-okd.yaml
+++ b/manifests/okd/kubevirt-tekton-tasks-okd.yaml
@@ -715,8 +715,6 @@ spec:
           value: direct
         - name: LIBGUESTFS_PATH
           value: /mnt/appliance
-      securityContext:
-        runAsUser: 0
       resources:
         limits:
           devices.kubevirt.io/kvm: '1'
@@ -784,8 +782,6 @@ spec:
           value: direct
         - name: LIBGUESTFS_PATH
           value: /mnt/appliance
-      securityContext:
-        runAsUser: 0
       resources:
         limits:
           devices.kubevirt.io/kvm: '1'
diff --git a/modules/disk-virt-customize/build/disk-virt-customize/Dockerfile b/modules/disk-virt-customize/build/disk-virt-customize/Dockerfile
index 0580bc57c..12a9578ab 100644
--- a/modules/disk-virt-customize/build/disk-virt-customize/Dockerfile
+++ b/modules/disk-virt-customize/build/disk-virt-customize/Dockerfile
@@ -25,6 +25,8 @@ ENV ENTRY_CMD=/usr/local/bin/${TASK_NAME} \
     USER_NAME=${TASK_NAME} \
     HOME=/home/${TASK_NAME}
 
+USER root
+
 # install libguestfs rhsrvany.exe win dependency for virt-customize
 COPY --from=rhsrvanyBuilder /rhsrvany/RHSrvAny/rhsrvany.exe /usr/share/virt-tools/rhsrvany.exe
 
@@ -32,7 +34,7 @@ COPY --from=rhsrvanyBuilder /rhsrvany/RHSrvAny/rhsrvany.exe /usr/share/virt-tool
 COPY --from=taskBuilder /${TASK_NAME} ${ENTRY_CMD}
 COPY build/${TASK_NAME}/bin /usr/local/bin
 
-#RUN  /usr/local/bin/user_setup
+RUN  /usr/local/bin/user_setup
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
 CMD ["--help"]
 
diff --git a/modules/disk-virt-sysprep/build/disk-virt-sysprep/Dockerfile b/modules/disk-virt-sysprep/build/disk-virt-sysprep/Dockerfile
index f49352d01..84d655331 100644
--- a/modules/disk-virt-sysprep/build/disk-virt-sysprep/Dockerfile
+++ b/modules/disk-virt-sysprep/build/disk-virt-sysprep/Dockerfile
@@ -25,6 +25,8 @@ ENV ENTRY_CMD=/usr/local/bin/${TASK_NAME} \
     USER_NAME=${TASK_NAME} \
     HOME=/home/${TASK_NAME} 
 
+USER root
+
 # install libguestfs rhsrvany.exe win dependency for virt-sysprep
 COPY --from=rhsrvanyBuilder /rhsrvany/RHSrvAny/rhsrvany.exe /usr/share/virt-tools/rhsrvany.exe
 
@@ -32,7 +34,7 @@ COPY --from=rhsrvanyBuilder /rhsrvany/RHSrvAny/rhsrvany.exe /usr/share/virt-tool
 COPY --from=taskBuilder /${TASK_NAME} ${ENTRY_CMD}
 COPY build/${TASK_NAME}/bin /usr/local/bin
 
-#RUN  /usr/local/bin/user_setup
+RUN  /usr/local/bin/user_setup
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
 CMD ["--help"]
 
diff --git a/tasks/disk-virt-customize/manifests/disk-virt-customize.yaml b/tasks/disk-virt-customize/manifests/disk-virt-customize.yaml
index be023213d..23a14f2dc 100644
--- a/tasks/disk-virt-customize/manifests/disk-virt-customize.yaml
+++ b/tasks/disk-virt-customize/manifests/disk-virt-customize.yaml
@@ -45,8 +45,6 @@ spec:
           value: direct
         - name: LIBGUESTFS_PATH
           value: /mnt/appliance
-      securityContext:
-        runAsUser: 0
       resources:
         limits:
           devices.kubevirt.io/kvm: '1'
diff --git a/tasks/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml b/tasks/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml
index 39d666b8f..8a9964801 100644
--- a/tasks/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml
+++ b/tasks/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml
@@ -45,8 +45,6 @@ spec:
           value: direct
         - name: LIBGUESTFS_PATH
           value: /mnt/appliance
-      securityContext:
-        runAsUser: 0
       resources:
         limits:
           devices.kubevirt.io/kvm: '1'
diff --git a/templates/disk-virt-customize/manifests/disk-virt-customize.yaml b/templates/disk-virt-customize/manifests/disk-virt-customize.yaml
index 96ba0fa95..80f1d1899 100644
--- a/templates/disk-virt-customize/manifests/disk-virt-customize.yaml
+++ b/templates/disk-virt-customize/manifests/disk-virt-customize.yaml
@@ -45,8 +45,6 @@ spec:
           value: direct
         - name: LIBGUESTFS_PATH
           value: /mnt/appliance
-      securityContext:
-        runAsUser: 0
       resources:
         limits:
           devices.kubevirt.io/kvm: '1'
diff --git a/templates/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml b/templates/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml
index e6f9da793..b20b16c3e 100644
--- a/templates/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml
+++ b/templates/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml
@@ -45,8 +45,6 @@ spec:
           value: direct
         - name: LIBGUESTFS_PATH
           value: /mnt/appliance
-      securityContext:
-        runAsUser: 0
       resources:
         limits:
           devices.kubevirt.io/kvm: '1'