diff --git a/.cockpit-composer.metadata b/.cockpit-composer.metadata
index 223348e..bd8867a 100644
--- a/.cockpit-composer.metadata
+++ b/.cockpit-composer.metadata
@@ -1 +1 @@
-348f01d4972dd228c1f4012ef911b81fecdad18d SOURCES/cockpit-composer-12.1.tar.gz
+50ed5f82f8134955f2d9cabdbd512b2d0c2066f5 SOURCES/cockpit-composer-21.tar.gz
diff --git a/.gitignore b/.gitignore
index e65c047..372b35f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cockpit-composer-12.1.tar.gz
+SOURCES/cockpit-composer-21.tar.gz
diff --git a/SPECS/cockpit-composer.spec b/SPECS/cockpit-composer.spec
index 6e0d096..4f4be6f 100644
--- a/SPECS/cockpit-composer.spec
+++ b/SPECS/cockpit-composer.spec
@@ -1,25 +1,25 @@
-# This spec file has been automatically updated
-Version:        12.1
-Release: 1%{?dist}
 Name:           cockpit-composer
+Version:        21
+Release:        1%{?dist}
 Summary:        Composer GUI for use with Cockpit
 
 License:        MIT
 URL:            http://weldr.io/
-Source0:        https://github.com/weldr/cockpit-composer/releases/download/%{version}/cockpit-composer-%{version}.tar.gz
+Source0:        https://github.com/osbuild/cockpit-composer/releases/download/%{version}/cockpit-composer-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  libappstream-glib
 
 Requires:       cockpit
-Requires:       lorax-composer
+Requires:       weldr
+Suggests:       osbuild-composer >= 14
 
 %description
 Composer generates custom images suitable for deploying systems or uploading to
-the cloud. It integrates into Cockpit as a frontend for Lorax Composer.
+the cloud. It integrates into Cockpit as a frontend for osbuild.
 
 %prep
-%setup -q -n cockpit-composer-%{version}
+%setup -q -n cockpit-composer
 
 %build
 # Nothing to build
@@ -38,6 +38,15 @@ cp -a io.weldr.cockpit-composer.metainfo.xml %{buildroot}/%{_datadir}/metainfo/
 %{_datadir}/metainfo/*
 
 %changelog
+* Wed Jun 14 2020 Lars Karlitski <larskarlitski@redhat.com> - 21.1-1
+- Support setting parameters (ref and parent) for ostree images
+- Loosen restrictions on password strength
+- Various UI refinements
+
+* Wed Jun 08 2020 Lars Karlitski <larskarlitski@redhat.com> - 20.1-1
+- Migrate to the osbuild-composer backend
+- Supports uploading images to AWS and Azure
+
 * Wed Feb 19 2020 Matej Marusak <mmarusak@redhat.com> - 12.1-1
 - Fix integration tests, external test repository URL ceased to exist
 - Translation updates rhbz#1784453