diff --git a/.gitignore b/.gitignore
index d04483b..f42d5ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -209,3 +209,4 @@
 /cockpit-244.1.tar.xz
 /cockpit-245.tar.xz
 /cockpit-246.tar.xz
+/cockpit-247.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index 7a9fb02..2d74ad6 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        246
+Version:        247
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -712,6 +712,12 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Jun 23 2021 Katerina Koukiou <kkoukiou@redhat.com> - 247-1
+
+- Metrics: Enable Grafana client setup
+- Machines: Share host files with the guest using virtio-fs
+- Machines: Show list of pass-through devices
+
 * Wed Jun 09 2021 Marius Vollmer <mvollmer@redhat.com> - 246-1
 
 - Improvements to the build system
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
index 08e16b0..8e24afa 100644
--- a/plans/upstream.fmf
+++ b/plans/upstream.fmf
@@ -2,6 +2,6 @@ discover:
   how: fmf
   repository: https://github.com/cockpit-project/cockpit
   # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585
-  ref: "246"
+  ref: "247"
 execute:
   how: tmt
diff --git a/sources b/sources
index 8ea680c..14c98ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-246.tar.xz) = 9f5ae6ec4ec9637bbe02243725f2f87d812d4ad99139d6734fa68e27b82196cde87dca56991216fe263cca05576451478ba53694ba38a2856da8fb0ed67906fe
+SHA512 (cockpit-247.tar.xz) = 787c461e604628278e2f1c61e319d7bb83fa8a2c28ab363df09bed4b4d393050d4bf29513415ae3200b40357ca2f465f5e87d6b1cc77320059c343aff5bb69fe