diff --git a/obs-packaging/qemu-vanilla/patches/0001-9p-removing-coroutines-of-9p-to-increase-the-I-O-per.patch b/qemu/patches/4.0.x/0001-9p-removing-coroutines-of-9p-to-increase-the-I-O-per.patch
similarity index 100%
rename from obs-packaging/qemu-vanilla/patches/0001-9p-removing-coroutines-of-9p-to-increase-the-I-O-per.patch
rename to qemu/patches/4.0.x/0001-9p-removing-coroutines-of-9p-to-increase-the-I-O-per.patch
diff --git a/obs-packaging/qemu-vanilla/patches/0002-migration-add-capability-to-bypass-the-shared-memory.patch b/qemu/patches/4.0.x/0002-migration-add-capability-to-bypass-the-shared-memory.patch
similarity index 100%
rename from obs-packaging/qemu-vanilla/patches/0002-migration-add-capability-to-bypass-the-shared-memory.patch
rename to qemu/patches/4.0.x/0002-migration-add-capability-to-bypass-the-shared-memory.patch
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 29127d3161..43bec99bcc 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -302,8 +302,9 @@ parts:
       esac
 
       # download source
-      git clone --branch ${branch} --single-branch ${url} ${pkg_name}
-      cd ${pkg_name}
+      pkg_repo_dir="${pkg_name}-repo"
+      git clone --branch ${branch} --single-branch ${url} "${pkg_repo_dir}"
+      cd ${pkg_repo_dir}
       git checkout ${commit}
 
       [ -n "$(ls -A ui/keycodemapdb)" ] || git clone https://github.com/qemu/keycodemapdb ui/keycodemapdb/