diff --git a/.obs/specfile/elemental.spec b/.obs/specfile/elemental.spec
index 920e7d639..b06005ee2 100644
--- a/.obs/specfile/elemental.spec
+++ b/.obs/specfile/elemental.spec
@@ -66,10 +66,7 @@ cp -a framework/files/* %{buildroot}
 rm -rf %{buildroot}/var/log/journal
 
 # remove luet config in Elemental Teal
-rm -rf %{buildroot}/etc/luet 
-
-# belongs to elemental-system-agent package
-rm %{buildroot}%{_unitdir}/elemental-system-agent.service
+rm -rf %{buildroot}/etc/luet
 
 # remove placeholders
 rm -rf %{buildroot}/usr/libexec/.placeholder
@@ -82,6 +79,7 @@ rm -rf %{buildroot}/usr/libexec/.placeholder
 %service_add_pre elemental-register-install.service
 %service_add_pre elemental-register-reset.service
 %service_add_pre elemental-register.timer
+%service_add_pre elemental-system-agent.service
 %endif
 
 %post
@@ -92,6 +90,7 @@ rm -rf %{buildroot}/usr/libexec/.placeholder
 %service_add_post elemental-register-install.service
 %service_add_post elemental-register-reset.service
 %service_add_post elemental-register.timer
+%service_add_post elemental-system-agent.service
 %else
 %systemd_post elemental-populate-node-labels.service
 %systemd_post shutdown-containerd.service
@@ -99,6 +98,7 @@ rm -rf %{buildroot}/usr/libexec/.placeholder
 %systemd_post elemental-register-install.service
 %systemd_post elemental-register-reset.service
 %systemd_post elemental-register.timer
+%systemd_post elemental-system-agent.service
 %endif
 
 %preun
@@ -109,6 +109,7 @@ rm -rf %{buildroot}/usr/libexec/.placeholder
 %service_del_preun elemental-register-install.service
 %service_del_preun elemental-register-reset.service
 %service_del_preun elemental-register.timer
+%service_del_preun elemental-system-agent.service
 %else
 %systemd_preun elemental-populate-node-labels.service
 %systemd_preun shutdown-containerd.service
@@ -116,6 +117,7 @@ rm -rf %{buildroot}/usr/libexec/.placeholder
 %systemd_preun elemental-register-install.service
 %systemd_preun elemental-register-reset.service
 %systemd_preun elemental-register.timer
+%systemd_preun elemental-system-agent.service
 %endif
 
 %postun
@@ -126,6 +128,7 @@ rm -rf %{buildroot}/usr/libexec/.placeholder
 %service_del_postun elemental-register-install.service
 %service_del_postun elemental-register-reset.service
 %service_del_postun elemental-register.timer
+%service_del_postun elemental-system-agent.service
 %else
 %systemd_postun elemental-populate-node-labels.service
 %systemd_postun shutdown-containerd.service
@@ -133,6 +136,7 @@ rm -rf %{buildroot}/usr/libexec/.placeholder
 %systemd_postun elemental-register-install.service
 %systemd_postun elemental-register-reset.service
 %systemd_postun elemental-register.timer
+%systemd_postun elemental-system-agent.service
 %endif
 
 %files
@@ -154,6 +158,7 @@ rm -rf %{buildroot}/usr/libexec/.placeholder
 %{_unitdir}/elemental-register-reset.service
 %{_unitdir}/elemental-register.timer
 %{_unitdir}/elemental-populate-node-labels.service
+%{_unitdir}/elemental-system-agent.service
 %{_sbindir}/elemental-populate-node-labels
 %dir /usr/libexec
 %dir %{systemdir}