diff --git a/ci/release/builders/aws_copy_keys.sh b/ci/release/builders/aws/copy-id.sh
similarity index 100%
rename from ci/release/builders/aws_copy_keys.sh
rename to ci/release/builders/aws/copy-id.sh
diff --git a/ci/release/builders/aws_ensure.sh b/ci/release/builders/aws/ensure.sh
similarity index 100%
rename from ci/release/builders/aws_ensure.sh
rename to ci/release/builders/aws/ensure.sh
diff --git a/ci/release/builders/ssh.sh b/ci/release/builders/aws/ssh.sh
similarity index 100%
rename from ci/release/builders/ssh.sh
rename to ci/release/builders/aws/ssh.sh