diff --git a/.gitignore b/.gitignore
index faa0df4..6de840e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /osbuild-composer-15.tar.gz
 /osbuild-composer-16.tar.gz
 /osbuild-composer-17.tar.gz
+/osbuild-composer-18.tar.gz
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 8550d76..92d31fa 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -4,7 +4,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        17
+Version:        18
 
 %gometa
 
@@ -49,8 +49,8 @@ BuildRequires:  golang(github.com/stretchr/testify/assert)
 
 Requires: %{name}-worker = %{version}-%{release}
 Requires: systemd
-Requires: osbuild >= 17
-Requires: osbuild-ostree >= 17
+Requires: osbuild >= 18
+Requires: osbuild-ostree >= 18
 
 Provides: weldr
 
@@ -107,7 +107,6 @@ TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d '
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-tests %{goipath}/cmd/osbuild-tests
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
-go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-rcm-tests %{goipath}/cmd/osbuild-rcm-tests
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests
 
 %endif
@@ -136,7 +135,6 @@ install -m 0755 -vp _bin/osbuild-tests                      %{buildroot}%{_libex
 install -m 0755 -vp _bin/osbuild-weldr-tests                %{buildroot}%{_libexecdir}/tests/osbuild-composer/
 install -m 0755 -vp _bin/osbuild-dnf-json-tests             %{buildroot}%{_libexecdir}/tests/osbuild-composer/
 install -m 0755 -vp _bin/osbuild-image-tests                %{buildroot}%{_libexecdir}/tests/osbuild-composer/
-install -m 0755 -vp _bin/osbuild-rcm-tests                  %{buildroot}%{_libexecdir}/tests/osbuild-composer/
 install -m 0755 -vp tools/image-info                        %{buildroot}%{_libexecdir}/osbuild-composer/
 
 install -m 0755 -vd                                         %{buildroot}%{_datadir}/tests/osbuild-composer
@@ -181,29 +179,6 @@ export GOPATH=$PWD/_build:%{gopath}
 %{_unitdir}/osbuild-remote-worker.socket
 %{_sysusersdir}/osbuild-composer.conf
 
-%package rcm
-Summary:    RCM-specific version of osbuild-composer
-Requires:   %{name} = %{version}-%{release}
-
-# remove in F34
-Obsoletes: golang-github-osbuild-composer-rcm < %{version}-%{release}
-Provides:  golang-github-osbuild-composer-rcm = %{version}-%{release}
-
-%description rcm
-RCM-specific version of osbuild-composer not intended for public usage.
-
-%files rcm
-%{_unitdir}/osbuild-rcm.socket
-
-%post rcm
-%systemd_post osbuild-rcm.socket
-
-%preun rcm
-%systemd_preun osbuild-rcm.socket
-
-%postun rcm
-%systemd_postun_with_restart osbuild-rcm.socket
-
 %package worker
 Summary:    The worker for osbuild-composer
 Requires:   systemd
@@ -242,11 +217,11 @@ systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
 %package tests
 Summary:    Integration tests
 Requires:   %{name} = %{version}-%{release}
-Requires:   %{name}-rcm = %{version}-%{release}
 Requires:   composer-cli
 Requires:   createrepo_c
 Requires:   genisoimage
 Requires:   qemu-kvm-core
+Requires:   systemd-container
 %ifarch %{arm}
 Requires:   edk2-aarch64
 %endif
@@ -262,6 +237,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Wed Jul 22 2020 Ondrej Budai <obudai@redhat.com> - 18-1
+- New upstream release
+
 * Wed Jul 08 2020 Ondrej Budai <obudai@redhat.com> - 17-1
 - New upstream release
 
diff --git a/sources b/sources
index aadc3f0..72132c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-composer-17.tar.gz) = ccb62ad5cd88d6578ff958f2bb7f061144f9f1417b1f1998ac935b476e51fc2d2ddf1fdb16517431b9e2138e8d2e34488a078e8eb282bb46f5fd0a7c55d2f87d
+SHA512 (osbuild-composer-18.tar.gz) = 458405f7efb7b67ce2d05109aaa2b0824a4a4374fb24f20f50c7d601d42e88b5e30a1079e973549176eec65d8ae885d3c38e07f628f1f54808456c7697db6ae3