diff --git a/hyper-v.spec b/hyper-v.spec
index 157a6d4..aae7e90 100644
--- a/hyper-v.spec
+++ b/hyper-v.spec
@@ -131,7 +131,7 @@ chmod 755 $RPM_BUILD_ROOT%{helper_dir}/bin/*
 d=$RPM_BUILD_ROOT%{_unitdir}
 mkdir -vp ${d}
 #
-cat > ${d}/%{hv_kvp_daemon}.service <<EOF
+tee ${d}/%{hv_kvp_daemon}.service <<EOF
 # started via %{_udevrulesdir}/%{hv_kvp_daemon}.rules
 [Unit]
 Description=Hyper-V KVP Daemon
@@ -153,7 +153,7 @@ Restart=no
 WantedBy=default.target
 EOF
 #
-cat > ${d}/%{hv_vss_daemon}.service <<EOF
+tee ${d}/%{hv_vss_daemon}.service <<EOF
 # started via %{_udevrulesdir}/%{hv_vss_daemon}.rules
 [Unit]
 Description=Hyper-V VSS Daemon
@@ -171,7 +171,7 @@ Restart=no
 WantedBy=default.target
 EOF
 #
-cat > ${d}/%{hv_fcopy_daemon}.service <<EOF
+tee ${d}/%{hv_fcopy_daemon}.service <<EOF
 # started via %{_udevrulesdir}/%{hv_fcopy_daemon}.rules
 [Unit]
 Description=Hyper-V host to guest file copy daemon
@@ -184,25 +184,23 @@ ExecStart=${bindir}/%{hv_fcopy_daemon} --no-daemon
 WantedBy=default.target
 EOF
 #
-head -n 42 ${d}/*.service 
 #
 #
 d=$RPM_BUILD_ROOT%{_udevrulesdir}
 mkdir -vp ${d}
-cat > ${d}/%{hv_kvp_daemon}.rules <<EOF
+tee ${d}/%{hv_kvp_daemon}.rules <<EOF
 ACTION=="add", KERNEL=="vmbus/hv_kvp", TAG+="systemd", ENV{SYSTEMD_WANTS}+="%{hv_kvp_daemon}.service"
 EOF
-cat > ${d}/%{hv_vss_daemon}.rules <<EOF
+tee ${d}/%{hv_vss_daemon}.rules <<EOF
 ACTION=="add", KERNEL=="vmbus/hv_vss", TAG+="systemd", ENV{SYSTEMD_WANTS}+="%{hv_vss_daemon}.service"
 EOF
-cat > ${d}/%{hv_fcopy_daemon}.rules <<EOF
+tee ${d}/%{hv_fcopy_daemon}.rules <<EOF
 ACTION=="add", KERNEL=="vmbus/hv_fcopy", TAG+="systemd", ENV{SYSTEMD_WANTS}+="%{hv_fcopy_daemon}.service"
 EOF
 #
-head -n 42 ${d}/*.rules
 #
 helper=inst_sys.sh
-cat > $RPM_BUILD_ROOT${bindir}/${helper} <<EOF
+tee $RPM_BUILD_ROOT${bindir}/${helper} <<EOF
 #!/bin/bash
 # Starting daemons via RUN== in udev rules is not supported.
 # In inst-sys systemd is not used, so start all daemons manually.
@@ -225,7 +223,6 @@ then
 fi
 EOF
 chmod 755 $RPM_BUILD_ROOT${bindir}/${helper}
-head -n 123 $RPM_BUILD_ROOT${bindir}/${helper}
 #
 %else
 mkdir -p $RPM_BUILD_ROOT/etc/init.d