diff --git a/.gitignore b/.gitignore
index c8aa96a..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1 @@
-/cockpit-podman-1.tar.gz
-/cockpit-podman-2.tar.gz
-/cockpit-podman-3.tar.gz
-/cockpit-podman-4.tar.gz
-/cockpit-podman-5.tar.gz
-/cockpit-podman-6.tar.gz
-/cockpit-podman-7.tar.gz
-/cockpit-podman-8.tar.gz
-/cockpit-podman-9.tar.gz
-/cockpit-podman-10.tar.gz
-/cockpit-podman-11.tar.gz
-/cockpit-podman-12.tar.gz
-/cockpit-podman-13.tar.gz
-/cockpit-podman-14.tar.gz
-/cockpit-podman-15.tar.gz
-/cockpit-podman-16.tar.gz
-/cockpit-podman-17.tar.gz
-/cockpit-podman-18.tar.gz
-/cockpit-podman-19.tar.gz
-/cockpit-podman-20.tar.gz
-/cockpit-podman-21.tar.gz
-/cockpit-podman-22.tar.gz
-/cockpit-podman-23.tar.gz
-/cockpit-podman-24.tar.gz
-/cockpit-podman-25.tar.gz
-/cockpit-podman-26.tar.gz
-/cockpit-podman-27.tar.gz
-/cockpit-podman-27.1.tar.gz
-/cockpit-podman-28.tar.gz
-/cockpit-podman-28.1.tar.gz
-/cockpit-podman-29.tar.gz
+/*.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 1bc634a..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# cockpit-podman
-
-The cockpit-podman package
\ No newline at end of file
diff --git a/cockpit-podman.spec b/cockpit-podman.spec
index af49485..912caad 100644
--- a/cockpit-podman.spec
+++ b/cockpit-podman.spec
@@ -1,23 +1,6 @@
 # This spec file has been automatically updated
-Version:        29
+Version: 31
 Release: 2%{?dist}
-#
-# Copyright (C) 2017-2020 Red Hat, Inc.
-#
-# Cockpit is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# Cockpit is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
-#
-
 Name:           cockpit-podman
 Summary:        Cockpit component for Podman containers
 License:        LGPLv2+
@@ -26,10 +9,9 @@ URL:            https://github.com/cockpit-project/cockpit-podman
 Source0:        https://github.com/cockpit-project/cockpit-podman/releases/download/%{version}/cockpit-podman-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  libappstream-glib
-BuildRequires:  make
 
 Requires:       cockpit-bridge >= 138
-Requires:       podman >= 2.0.4
+Requires:       podman >= 1.3.0
 
 %description
 The Cockpit user interface for Podman containers.
@@ -51,6 +33,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
 %{_datadir}/metainfo/*
 
 %changelog
+* Mon Jun 14 2021 Jindrich Novy <jnovy@redhat.com> - 31-2
+- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/31
+- Related: #1970747
+
 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 29-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
diff --git a/gating.yaml b/gating.yaml
index c2182c7..6985029 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
+  - rhel-8
+decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/sources b/sources
index 04f7954..f58a330 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-podman-29.tar.gz) = c3e42c57a3c2bfa3c9f9638553228acb69d50c3b5b0f04705a18d8bc0885a7d47f9abe3460a4f140a7456afa568baa05d92ec3c0085a4f0694b11f5d8f461a2e
+SHA512 (cockpit-podman-31.tar.gz) = be00a0b969440a03fffc778ec9e2a15f823063b9a6415f7b49073487f03f3c18125d83d16c22c121d9bfd09b2fdf9ff183c352060f883b0e56ee08c0c2828dce
diff --git a/tests/browser.sh b/tests/browser.sh
index 3ddff89..2eb957f 100755
--- a/tests/browser.sh
+++ b/tests/browser.sh
@@ -1,14 +1,10 @@
 #!/bin/sh
 set -eux
 
-TESTS="$(realpath $(dirname "$0"))"
-if [ -d source ]; then
-    # path for standard-test-source
-    SOURCE="$(pwd)/source"
-else
-    SOURCE="$(realpath $TESTS/..)"
-fi
+# from standard-test-source
+SOURCE="$(pwd)/source"
 LOGS="$(pwd)/logs"
+TESTS="$(pwd)/tests"
 mkdir -p "$LOGS"
 chmod a+w "$LOGS"
 
@@ -22,11 +18,6 @@ if ! rpm -q chromium; then
     dnf install -y chromium
 fi
 
-# HACK: systemd kills the services after 90s
-# See https://github.com/containers/podman/issues/8751
-sed -i 's/Type=notify/Type=exec/' /usr/lib/systemd/system/podman.service
-sed -i 's/Type=notify/Type=exec/' /usr/lib/systemd/user/podman.service
-
 # create user account for logging in
 if ! id admin 2>/dev/null; then
     useradd -c Administrator -G wheel admin
@@ -60,6 +51,7 @@ podman pull quay.io/cockpit/registry:2
 
 # copy images for user podman tests; podman insists on user session
 loginctl enable-linger $(id -u admin)
+sudo -i -u admin podman rmi --all
 for img in quay.io/libpod/busybox quay.io/libpod/alpine quay.io/cockpit/registry:2; do
     podman save  $img | sudo -i -u admin podman load
 done
diff --git a/tests/roles/test/tasks/main.yml b/tests/roles/test/tasks/main.yml
index 9c0d557..13c9a92 100644
--- a/tests/roles/test/tasks/main.yml
+++ b/tests/roles/test/tasks/main.yml
@@ -1,11 +1,4 @@
 ---
-- name: upgrade critical packages to the latest version
-  dnf:
-    name:
-      - podman
-      - conmon
-    state: latest
-
 - include_role:
     name: standard-test-source
 
diff --git a/tests/tests.yml b/tests/tests.yml
index 20eb99f..2688f2e 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: localhost
   tags:
-    - classic
+    - always
   roles:
     - test