diff --git a/.gitignore b/.gitignore
index ee15df1..66054c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /osbuild-composer-22.tar.gz
 /osbuild-composer-23.tar.gz
 /osbuild-composer-24.tar.gz
+/osbuild-composer-25.tar.gz
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 9572262..de906d0 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -4,7 +4,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        24
+Version:        25
 
 %gometa
 
@@ -56,8 +56,6 @@ BuildRequires:  golang(github.com/vmware/govmomi)
 
 Requires: %{name}-worker = %{version}-%{release}
 Requires: systemd
-Requires: osbuild >= 23
-Requires: osbuild-ostree >= 23
 Requires: qemu-img
 
 Provides: weldr
@@ -78,7 +76,7 @@ Obsoletes: golang-github-osbuild-composer < %{version}-%{release}
 Provides:  golang-github-osbuild-composer = %{version}-%{release}
 
 # remove when F34 is EOL
-Obsoletes: osbuild-composer-koji
+Obsoletes: osbuild-composer-koji <= 23
 
 %description
 %{common_description}
@@ -155,15 +153,7 @@ install -m 0755 -vd                                             %{buildroot}%{_d
 install -m 0644 -vp repositories/*                              %{buildroot}%{_datadir}/osbuild-composer/repositories/
 
 install -m 0755 -vd                                             %{buildroot}%{_unitdir}
-install -m 0644 -vp distribution/osbuild-composer.service       %{buildroot}%{_unitdir}/
-install -m 0644 -vp distribution/osbuild-composer.socket        %{buildroot}%{_unitdir}/
-install -m 0644 -vp distribution/osbuild-remote-worker.socket   %{buildroot}%{_unitdir}/
-install -m 0644 -vp distribution/osbuild-remote-worker@.service %{buildroot}%{_unitdir}/
-install -m 0644 -vp distribution/osbuild-worker@.service        %{buildroot}%{_unitdir}/
-install -m 0644 -vp distribution/osbuild-composer-api.socket    %{buildroot}%{_unitdir}/
-install -m 0755 -vd                                             %{buildroot}%{_unitdir}
-install -m 0644 -vp distribution/osbuild-composer.{service,socket} %{buildroot}%{_unitdir}/
-install -m 0644 -vp distribution/osbuild-*worker*.{service,socket} %{buildroot}%{_unitdir}/
+install -m 0644 -vp distribution/*.{service,socket}             %{buildroot}%{_unitdir}/
 
 install -m 0755 -vd                                             %{buildroot}%{_sysusersdir}
 install -m 0644 -vp distribution/osbuild-composer.conf          %{buildroot}%{_sysusersdir}/
@@ -255,13 +245,15 @@ cd $PWD/_build/src/%{goipath}
 %{_unitdir}/osbuild-composer.service
 %{_unitdir}/osbuild-composer.socket
 %{_unitdir}/osbuild-composer-api.socket
+%{_unitdir}/osbuild-local-worker.socket
 %{_unitdir}/osbuild-remote-worker.socket
 %{_sysusersdir}/osbuild-composer.conf
 
 %package worker
 Summary:    The worker for osbuild-composer
 Requires:   systemd
-Requires:   osbuild
+Requires:   osbuild >= 23
+Requires:   osbuild-ostree >= 23
 
 # remove in F34
 Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
@@ -348,6 +340,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Thu Nov 19 2020 Ondrej Budai <obudai@redhat.com> - 25-1
+- New upstream release
+
 * Thu Nov 12 2020 Ondrej Budai <obudai@redhat.com> - 24-1
 - New upstream release
 
diff --git a/sources b/sources
index 11f6b71..5a5fb2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-composer-24.tar.gz) = 4146f0a1313b438d869c9110706591e6ce939002b6d64a8a3c196ac94b222d9596f4a34100d2dc29b0505a3150ad9da13bec4d1039650be0ff807b9e7f112e5e
+SHA512 (osbuild-composer-25.tar.gz) = dcabcd59a361bf5eef3989e413902837b2d69fca58445d617b3c83bdba899048c8a53b04b9bb408207a3f7af505bc6cd703c3048c59ed5c0c74eb8b40b03ea5c