diff --git a/build/docker/intel-fpga-admissionwebhook.Dockerfile b/build/docker/intel-fpga-admissionwebhook.Dockerfile
index 734a1298..930a674d 100644
--- a/build/docker/intel-fpga-admissionwebhook.Dockerfile
+++ b/build/docker/intel-fpga-admissionwebhook.Dockerfile
@@ -32,4 +32,4 @@ RUN chmod a+x /go/bin/fpga_admissionwebhook \
 
 FROM scratch as final
 COPY --from=builder /install_root /
-CMD ["/usr/local/bin/intel_fpga_admissionwebhook"]
+ENTRYPOINT ["/usr/local/bin/intel_fpga_admissionwebhook"]
diff --git a/build/docker/intel-fpga-initcontainer.Dockerfile b/build/docker/intel-fpga-initcontainer.Dockerfile
index 211f8e19..b32e9db9 100644
--- a/build/docker/intel-fpga-initcontainer.Dockerfile
+++ b/build/docker/intel-fpga-initcontainer.Dockerfile
@@ -38,7 +38,7 @@ RUN cd $DIR/cmd/fpga_crihook && \
 FROM scratch as final
 COPY --from=builder /install_root /
 
-ARG SRC_DIR=/usr/local/fpga-sw.src
+ARG SRC_DIR=/usr/local/fpga-sw
 ARG DST_DIR=/opt/intel/fpga-sw
 
 # CRI hook
@@ -64,4 +64,4 @@ ln -sf $HOOK_CONF_DST /etc/containers/oci/hooks.d/$HOOK_CONF\n\
 rm $DST_DIR/deploy.sh\n\
 ">> $SRC_DIR/deploy.sh && chmod +x $SRC_DIR/deploy.sh
 
-CMD [ "/opt/intel/fpga-sw.src/deploy.sh" ]
+ENTRYPOINT [ "/usr/local/fpga-sw/deploy.sh" ]
diff --git a/deployments/fpga_admissionwebhook/deployment-tpl.yaml b/deployments/fpga_admissionwebhook/deployment-tpl.yaml
index 44b29037..d8a64fb1 100644
--- a/deployments/fpga_admissionwebhook/deployment-tpl.yaml
+++ b/deployments/fpga_admissionwebhook/deployment-tpl.yaml
@@ -15,8 +15,6 @@ spec:
         - name: fpga-mutator
           image: intel-fpga-admissionwebhook:devel
           imagePullPolicy: IfNotPresent
-          command:
-            - /usr/bin/intel_fpga_admissionwebhook
           args:
             - -tls-cert-file=/etc/webhook/certs/cert.pem
             - -tls-private-key-file=/etc/webhook/certs/key.pem
diff --git a/deployments/fpga_plugin/fpga_plugin.yaml b/deployments/fpga_plugin/fpga_plugin.yaml
index 0cdad820..3ba7c357 100644
--- a/deployments/fpga_plugin/fpga_plugin.yaml
+++ b/deployments/fpga_plugin/fpga_plugin.yaml
@@ -19,7 +19,6 @@ spec:
       - name: intel-fpga-initcontainer
         image: intel-fpga-initcontainer:devel
         imagePullPolicy: IfNotPresent
-        command: ['/opt/intel/fpga-sw.src/deploy.sh']
         volumeMounts:
         - mountPath: /opt/intel/fpga-sw
           name: intel-fpga-sw