diff --git a/.gitignore b/.gitignore
index 792e044..f7d1504 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osbuild-composer-17.tar.gz
+SOURCES/osbuild-composer-19.tar.gz
diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata
index ef7464e..f668146 100644
--- a/.osbuild-composer.metadata
+++ b/.osbuild-composer.metadata
@@ -1 +1 @@
-fcbcceea3a985361ec21f477f71c16f9d6bba835 SOURCES/osbuild-composer-17.tar.gz
+a524287f03ca4e37b643218404c7ed47b6941d80 SOURCES/osbuild-composer-19.tar.gz
diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec
index 1ca351f..9a32a04 100644
--- a/SPECS/osbuild-composer.spec
+++ b/SPECS/osbuild-composer.spec
@@ -4,7 +4,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        17
+Version:        19
 
 %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
+* Thu Aug 13 2020 Tom Gundersen <tgunders@redhat.com> - 19-1
+- New upstream release 19 (rhbz#1866015 and rhbz#1866013)
+
 * Thu Jul 09 2020 Ondrej Budai <obudai@redhat.com> - 17-1
 - New upstream release 17 (rhbz#1831653)
 - Obsolete lorax-composer in favor of osbuild-composer (rhbz#1836844)