diff --git a/_service b/_service
index e614d69..e16568f 100644
--- a/_service
+++ b/_service
@@ -1,14 +1,15 @@
 <services>
-  <service name="tar_scm" mode="disabled">
-    <param name="version">2.20</param>
-    <param name="versionformat">2.20+git%cd.%h</param>
+  <service name="obs_scm" mode="disabled">
+    <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
     <param name="url">https://github.com/openSUSE/microos-tools.git</param>
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service name="recompress" mode="disabled">
+  <service name="set_version" mode="disabled"/>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
     <param name="compression">xz</param>
     <param name="file">*.tar</param>
   </service>
-  <service name="set_version" mode="disabled"/>
 </services>
diff --git a/_servicedata b/_servicedata
index 7da1495..c4f9b40 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,5 +1,5 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/openSUSE/microos-tools.git</param>
-  <param name="changesrevision">2a43cdb3220241f02b8cae551976aa1776c69b38</param></service>
+  <param name="changesrevision">aeedf237cc4fce2b2da856fc29347f555a26abff</param></service>
 </servicedata>
\ No newline at end of file
diff --git a/microos-tools-2.20+git20230413.2a43cdb.tar.xz b/microos-tools-2.20+git20230413.2a43cdb.tar.xz
deleted file mode 100644
index b12dbc2..0000000
--- a/microos-tools-2.20+git20230413.2a43cdb.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7022d527c95bb469393ba7a3d8602331397c86d4304035837b42e646592955ac
-size 81692
diff --git a/microos-tools-2.21+git0.obscpio b/microos-tools-2.21+git0.obscpio
new file mode 100644
index 0000000..d652905
--- /dev/null
+++ b/microos-tools-2.21+git0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b4a85c8830b3d472a753022ce2097e487c69d66e1861889a3c654d7c101eba7
+size 45578
diff --git a/microos-tools.changes b/microos-tools.changes
index 58d33f4..3f3821b 100644
--- a/microos-tools.changes
+++ b/microos-tools.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr 20 11:42:22 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- Switch to obs_scm
+- Call autogen.sh so that it actually builds
+- Update to version 2.21+git0:
+  * Release version 2.21
+  * 98selinux-microos: Work around overlayfs bug (bsc#1210690)
+  * 98selinux-microos: Create .relabelled marker before relabelling
+
 -------------------------------------------------------------------
 Thu Apr 13 09:34:21 UTC 2023 - kukuk@suse.com
 
diff --git a/microos-tools.obsinfo b/microos-tools.obsinfo
new file mode 100644
index 0000000..4a40f9b
--- /dev/null
+++ b/microos-tools.obsinfo
@@ -0,0 +1,4 @@
+name: microos-tools
+version: 2.21+git0
+mtime: 1681990582
+commit: aeedf237cc4fce2b2da856fc29347f555a26abff
diff --git a/microos-tools.spec b/microos-tools.spec
index 37ee7f1..7190964 100644
--- a/microos-tools.spec
+++ b/microos-tools.spec
@@ -19,7 +19,7 @@
 %{!?_distconfdir: %global _distconfdir %{_prefix}%{_sysconfdir}}
 
 Name:           microos-tools
-Version:        2.20+git20230413.2a43cdb
+Version:        2.21+git0
 Release:        0
 Summary:        Files and Scripts for openSUSE MicroOS
 License:        GPL-2.0-or-later
@@ -29,6 +29,7 @@ Source:         microos-tools-%{version}.tar.xz
 Source1:        tmp.mount
 Source2:        microos-tmp.conf
 Source99:       microos-tools-rpmlintrc
+BuildRequires:  automake
 BuildRequires:  distribution-release
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dracut)
@@ -49,6 +50,7 @@ This package contains tools to make developing of MicroOS easier.
 %autosetup -p1
 
 %build
+./autogen.sh
 %configure
 %make_build