diff --git a/.gitignore b/.gitignore
index ff7730d..94fbe7f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /v0.6.tar.gz
 /v0.7.tar.gz
 /v0.8.tar.gz
+/v0.9.tar.gz
diff --git a/greenboot.spec b/greenboot.spec
old mode 100755
new mode 100644
index ff4b3d5..9d6f875
--- a/greenboot.spec
+++ b/greenboot.spec
@@ -1,10 +1,10 @@
 Name:               greenboot
-Version:            0.8
+Version:            0.9
 Release:            1%{?dist}
 Summary:            Generic Health Check Framework for systemd
 License:            LGPLv2+
 
-%global repo_owner  LorbusChris
+%global repo_owner  fedora-iot
 %global repo_name   %{name}
 %global repo_tag    v%{version}
 
@@ -67,16 +67,15 @@ Requires:           %{name} = %{version}-%{release}
 %build
 
 %install
+mkdir -p %{buildroot}%{_exec_prefix}/lib/motd.d/
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/check/required.d
 mkdir    %{buildroot}%{_sysconfdir}/%{name}/check/wanted.d
 mkdir    %{buildroot}%{_sysconfdir}/%{name}/green.d
 mkdir    %{buildroot}%{_sysconfdir}/%{name}/red.d
 mkdir -p %{buildroot}%{_unitdir}
-install -DpZm 0755 usr/libexec/greenboot/greenboot %{buildroot}%{_libexecdir}/%{name}/%{name}
-install -DpZm 0755 usr/libexec/greenboot/greenboot-grub2-set-counter %{buildroot}%{_libexecdir}/%{name}/greenboot-grub2-set-counter
-install -DpZm 0755 usr/libexec/greenboot/greenboot-rpm-ostree-grub2-check-fallback %{buildroot}%{_libexecdir}/%{name}/greenboot-rpm-ostree-grub2-check-fallback
-install -DpZm 0755 usr/libexec/greenboot/greenboot-status %{buildroot}%{_libexecdir}/%{name}/greenboot-status
-install -DpZm 0755 usr/libexec/greenboot/redboot-auto-reboot-check %{buildroot}%{_libexecdir}/%{name}/redboot-auto-reboot-check
+mkdir -p %{buildroot}%{_tmpfilesdir}
+install -DpZm 0755 usr/libexec/greenboot/* %{buildroot}%{_libexecdir}/%{name}
 install -DpZm 0644 usr/lib/motd.d/boot-status %{buildroot}%{_exec_prefix}/lib/motd.d/boot-status
 install -DpZm 0644 usr/lib/systemd/system/* %{buildroot}%{_unitdir}
 install -DpZm 0644 usr/lib/tmpfiles.d/greenboot-status-motd.conf %{buildroot}%{_tmpfilesdir}/greenboot-status-motd.conf
@@ -86,6 +85,7 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n
 %post
 %systemd_post greenboot-healthcheck.service
 %systemd_post greenboot.service
+%systemd_post greenboot.target
 %systemd_post redboot.service
 %systemd_post redboot.target
 
@@ -121,6 +121,7 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n
 %postun
 %systemd_postun greenboot-healthcheck.service
 %systemd_postun greenboot.service
+%systemd_postun greenboot.target
 %systemd_postun redboot.service
 %systemd_postun redboot.target
 
@@ -141,6 +142,7 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n
 %{_libexecdir}/%{name}/%{name}
 %{_unitdir}/greenboot-healthcheck.service
 %{_unitdir}/greenboot.service
+%{_unitdir}/greenboot.target
 %{_unitdir}/redboot.service
 %{_unitdir}/redboot.target
 %dir %{_sysconfdir}/%{name}
@@ -168,10 +170,13 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n
 %{_unitdir}/greenboot-grub2-set-counter.service
 
 %files reboot
-%{_libexecdir}/%{name}/redboot-auto-reboot-check
+%{_libexecdir}/%{name}/redboot-auto-reboot
 %{_unitdir}/redboot-auto-reboot.service
 
 %changelog
+* Fri Apr 03 2020 Christian Glombek <lorbus@fedoraproject.org> - 0.9-1
+- Update to v0.9
+
 * Wed Feb 05 2020 Christian Glombek <lorbus@fedoraproject.org> - 0.8-1
 - Update to v0.8
 - Add guard against bootlooping in redboot-auto-reboot.service
diff --git a/sources b/sources
index 8157dd5..613331d 100755
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v0.8.tar.gz) = a3ff67ab22e574d1dd6404e602167961b3815e8b82d6cea4236e3f3df84e74bf15fd81c81ed4798ad6937d0dd4976b7447a5a499015d312e090c7ea4ab7b740d
+SHA512 (v0.9.tar.gz) = b382834faa94614a47deb41f5757c03f7912dde64714d2f8bde8ca167169c19bddd4a86ce8818c832b9da5ee4fc14f000fcc5633314dd1e10df7b1e6a9418ed0