diff --git a/manifests/shared-workarounds.yaml b/manifests/shared-workarounds.yaml
index 500582942b..4ae54f4c90 100644
--- a/manifests/shared-workarounds.yaml
+++ b/manifests/shared-workarounds.yaml
@@ -1,2 +1,7 @@
 # This manifest is a list of shared workarounds that are needed in both Fedora CoreOS
 # and downstreams (i.e. Red Hat CoreOS).
+
+packages:
+  # It will include xxd for FCOS and vim-common for RHCOS
+  # We can drop it once we get https://bugzilla.redhat.com/show_bug.cgi?id=2182865 done
+  - /usr/bin/xxd
diff --git a/overlay.d/30gcp-udev-rules/usr/lib/udev/google_nvme_id b/overlay.d/30gcp-udev-rules/usr/lib/udev/google_nvme_id
old mode 100644
new mode 100755