diff --git a/_service b/_service
index 8dd844d..e05201b 100644
--- a/_service
+++ b/_service
@@ -1,21 +1,16 @@
 <services>
-
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/kubernetes-sigs/cri-tools.git</param>
-<param name="scm">git</param>
-<param name="filename">cri-tools</param>
-<param name="versionformat">1.20.0</param>
-<param name="revision">v1.20.0</param>
-<param name="changesgenerate">enable</param>
-</service>
-
-<service name="recompress" mode="disabled">
-<param name="file">*.tar</param>
-<param name="compression">xz</param>
-</service>
-
-<service name="set_version" mode="disabled">
-<param name="basename">cri-tools</param>
-</service>
-
+  <service name="tar_scm" mode="disabled">
+    <param name="url">https://github.com/kubernetes-sigs/cri-tools.git</param>
+    <param name="scm">git</param>
+    <param name="revision">v1.21.0</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="changesgenerate">enable</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+  </service>
+  <service mode="disabled" name="set_version">
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
 </services>
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..dfeeb36
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://github.com/kubernetes-sigs/cri-tools.git</param>
+              <param name="changesrevision">80bcedb1222865e848a4232a4bcf1a388b328ba9</param></service></servicedata>
\ No newline at end of file
diff --git a/cri-tools-1.20.0.tar.xz b/cri-tools-1.20.0.tar.xz
deleted file mode 100644
index 87cced8..0000000
--- a/cri-tools-1.20.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4680d93665412326fa45ebea1a9ebb72064f6c1710547de27323d56fdad8d5bb
-size 3065744
diff --git a/cri-tools-1.21.0.tar.xz b/cri-tools-1.21.0.tar.xz
new file mode 100644
index 0000000..6a26b48
--- /dev/null
+++ b/cri-tools-1.21.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a08e5ffc4e4f29350a58dac3ebe45c3160c004da1907cb789dcaf4b467448a35
+size 3333708
diff --git a/cri-tools.changes b/cri-tools.changes
index 6c7e35e..7ca1a04 100644
--- a/cri-tools.changes
+++ b/cri-tools.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Apr 12 07:32:53 UTC 2021 - alexandre.vicenzi@suse.com
+
+- Update to version 1.21.0:
+  * Bump README versions to v1.21.0
+  * Update dependencies
+  * Add dependabot config file
+  * Simplify test image build process for user images
+  * Move from gcr.io/cri-tools to gcr.io/k8s-staging-cri-tools
+  * Fix UID/GID and username values for test images
+  * Bump gcb-docker-gcloud image to v20210331-c732583
+  * Fix CRI-O master installation in GitHub actions
+
 -------------------------------------------------------------------
 Fri Jan 08 12:24:37 UTC 2021 - rbrown@suse.com
 
diff --git a/cri-tools.spec b/cri-tools.spec
index 738a15a..e33ef30 100644
--- a/cri-tools.spec
+++ b/cri-tools.spec
@@ -20,7 +20,7 @@
 %define name_source1    crictl.yaml
 
 Name:           cri-tools
-Version:        1.20.0
+Version:        1.21.0
 Release:        0
 Summary:        CLI and validation tools for Kubelet Container Runtime Interface
 License:        Apache-2.0