diff --git a/docs/developer/repos.md b/docs/developer/repos.md
index 13d2225..840935a 100644
--- a/docs/developer/repos.md
+++ b/docs/developer/repos.md
@@ -4,6 +4,26 @@
 project.  This document explains how to work with the different repositories,
 their purpose, and how to maintain them.
 
+## Creating a new fork
+
+In order to create a new fork of a repository, we'll need to create a fork
+under the `vexxhost` organization.  In this example, we'll assume that you're
+creating a fork of the `openstack/horizon` project.
+
+In order to fork the project, you'll start with the following command which
+assumes that you have the `gh` command line tool installed:
+
+```bash
+./hack/repos/fork openstack/horizon
+```
+
+> **Note**
+>
+> If this is an OpenStack project, once you're done, you'll also need to update
+> the `FORKED_PROJECTS` variable in the
+> `internal/pkg/image_repositories/build_workflow.go` file to include the newly
+> forked project.
+
 ## OpenStack
 
 Atmosphere has a few forks of the OpenStack repositories.  These are used to
@@ -12,23 +32,6 @@
 
 * [openstack/horizon](https://github.com/vexxhost/horizon)
 
-### Creating a new fork
-
-In order to create a new fork of an OpenStack repository, we'll need to create
-a fork under the `vexxhost` organization.  In this example, we'll assume that
-you're creating a fork of the Horizon project.
-
-In order to fork the project, you'll start with the following command which
-assumes that you have the `gh` command line tool installed:
-
-```bash
-./hack/repos/openstack/fork horizon
-```
-
-Once you're done, you'll also need to update the `FORKED_PROJECTS` variable in
-the `internal/pkg/image_repositories/build_workflow.go` file to include the
-newly forked project.
-
 ### Applying patches
 
 The only time that it is necessary to apply patches to the forked repositories
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='
diff --git a/roles/magnum/tasks/main.yml b/roles/magnum/tasks/main.yml
index 785be09..05eecb1 100644
--- a/roles/magnum/tasks/main.yml
+++ b/roles/magnum/tasks/main.yml
@@ -41,7 +41,7 @@
   ansible.builtin.get_url:
     url: "{{ magnum_clusterctl_url }}"
     dest: /usr/local/bin/clusterctl
-    mode: 0755
+    mode: "0755"
     owner: root
     group: root
 
@@ -49,7 +49,7 @@
   ansible.builtin.copy:
     content: "{{ magnum_clusterctl_config | to_nice_yaml }}"
     dest: "{{ magnum_clusterctl_config_file }}"
-    mode: 0644
+    mode: "0644"
     owner: root
     group: root