diff --git a/hack/repos/openstack/fork b/hack/repos/fork
similarity index 93%
rename from hack/repos/openstack/fork
rename to hack/repos/fork
index 0a6ec6e..0682363 100755
--- a/hack/repos/openstack/fork
+++ b/hack/repos/fork
@@ -1,8 +1,8 @@
 #!/bin/bash -xe
 
-gh repo fork openstack/${1} --org vexxhost
+gh repo fork ${1} --org vexxhost
 
-REPOSITORY_ID_QUERY="{repository(owner: \"vexxhost\", name: \"${1}\"){id}}"
+REPOSITORY_ID_QUERY="{repository(owner: \"vexxhost\", name: \"${1##*/}\"){id}}"
 REPOSITORY_ID=$(gh api graphql -f query="${REPOSITORY_ID_QUERY}" -q .data.repository.id)
 
 gh api graphql -f query='