diff --git a/cockpit-podman.spec b/cockpit-podman.spec
index 7764271..e27cd21 100644
--- a/cockpit-podman.spec
+++ b/cockpit-podman.spec
@@ -1,23 +1,41 @@
 # This spec file has been automatically updated
-Version: 35
+Version: 36
 Release: 1%{?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+
 URL:            https://github.com/cockpit-project/cockpit-podman
 
-Source0:        https://github.com/cockpit-project/cockpit-podman/releases/download/%{version}/cockpit-podman-%{version}.tar.xz
+Source0:        https://github.com/cockpit-project/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
 BuildArch:      noarch
 BuildRequires:  libappstream-glib
+BuildRequires:  make
 
 Requires:       cockpit-bridge >= 138
-Requires:       podman >= 1.3.0
+Requires:       podman >= 2.0.4
 
 %description
 The Cockpit user interface for Podman containers.
 
 %prep
-%setup -q -n cockpit-podman
+%setup -q -n %{name}
 
 %build
 # Nothing to build
@@ -28,11 +46,15 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
 
 %files
 %doc README.md
-%license LICENSE
+%license LICENSE dist/index.js.LICENSE.txt.gz
 %{_datadir}/cockpit/*
 %{_datadir}/metainfo/*
 
 %changelog
+* Wed Nov 10 2021 Jindrich Novy <jnovy@redhat.com> - 36-1
+- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/36
+- Related: #2000051
+
 * Wed Sep 15 2021 Jindrich Novy <jnovy@redhat.com> - 35-1
 - update to https://github.com/cockpit-project/cockpit-podman/releases/tag/35
 - Related: #2000051
diff --git a/sources b/sources
index 0e06401..fe41ff8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-podman-35.tar.xz) = 7203731dd5ddab7560760d432ac3094228d545db90e2545a567ff63a586be8678bbac609f00504004944cf14f1956ac59a29356fa110ff8c2d6236ad216bd508
+SHA512 (cockpit-podman-36.tar.xz) = 74820835e1f939baffd39296735ad367c6bf40a4fd5f4310876c2d5f453b6ab5f858849350fd0cbf4e7105551133125ec797542dcc5229c81c423f45f327581e
diff --git a/tests/roles/test/tasks/main.yml b/tests/roles/test/tasks/main.yml
index 13c9a92..7c81d2f 100644
--- a/tests/roles/test/tasks/main.yml
+++ b/tests/roles/test/tasks/main.yml
@@ -1,4 +1,11 @@
 ---
+- name: upgrade critical packages to the latest version
+  dnf:
+    name:
+      - podman
+      - conmon
+    state: latest
+
 - include_role:
     name: standard-test-source
 
@@ -16,6 +23,8 @@
       - python3
     tests:
       - cockpit-podman:
-          dir: .
-          run: "{{ test_script_dir | default('.') }}/browser.sh"
+          dir: "{{ test_script_dir | default('.') }}/source"
+          # directory changed after release 29: https://github.com/cockpit-project/cockpit-podman/pull/684
+          # drop this after packaging 30
+          run: "if [ -e test/browser/browser.sh ]; then test/browser/browser.sh; else plans/browser.sh; fi"
           save-files: ["logs/*"]
diff --git a/tests/tests.yml b/tests/tests.yml
index 2688f2e..20eb99f 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: localhost
   tags:
-    - always
+    - classic
   roles:
     - test