diff --git a/.conmon.metadata b/.conmon.metadata
index 7b71dc1..6a6c6cc 100644
--- a/.conmon.metadata
+++ b/.conmon.metadata
@@ -1 +1 @@
-e533e70b592317ab18e0229f3361ddf297824d0b SOURCES/conmon-29c3367.tar.gz
+6077c3ee1cfebf187ae3c67aec5bccbc1ef14127 SOURCES/v2.0.18.tar.gz
diff --git a/.gitignore b/.gitignore
index 3396aa8..e9a8dec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/conmon-29c3367.tar.gz
+SOURCES/v2.0.18.tar.gz
diff --git a/SPECS/conmon.spec b/SPECS/conmon.spec
index 9e0e097..2fcdac2 100644
--- a/SPECS/conmon.spec
+++ b/SPECS/conmon.spec
@@ -14,22 +14,16 @@
 %global repo conmon
 # https://github.com/containers/conmon
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit0 29c336700f2999acf9db07662b4a61355076e64a
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global git0 https://%{import_path}
 
-# Used for comparing with latest upstream tag
-# to decide whether to autobuild (non-rawhide only)
-%global built_tag v2.0.1
-
 Name: %{repo}
 Epoch: 2
-Version: 2.0.6
+Version: 2.0.18
 Release: 1%{?dist}
 Summary: OCI container runtime monitor
 License: ASL 2.0
 URL: %{git0}
-Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
+Source0: %{git0}/archive/v%{version}.tar.gz
 BuildRequires: gcc
 BuildRequires: git
 BuildRequires: glib2-devel
@@ -39,7 +33,7 @@ BuildRequires: systemd-devel
 %{summary}.
 
 %prep
-%autosetup -Sgit -n %{name}-%{commit0}
+%autosetup -Sgit
 
 %build
 %{__make} all
@@ -56,6 +50,26 @@ BuildRequires: systemd-devel
 %{_bindir}/%{name}
 
 %changelog
+* Tue Jun 16 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.18-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.18
+- Related: #1821193
+
+* Tue May 26 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.17-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.17
+- Related: #1821193
+
+* Wed May 13 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.16-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.16
+- Related: #1821193
+
+* Tue May 12 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.15-2
+- synchronize containter-tools 8.3.0 with 8.2.1
+- Related: #1821193
+
+* Mon Apr 06 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.15-1
+- update to 2.0.15
+- Related: #1821193
+
 * Wed Dec 11 2019 Jindrich Novy <jnovy@redhat.com> - 2:2.0.6-1
 - update to 2.0.6
 - Related: RHELPLAN-25139