diff --git a/.cirrus.yml b/.cirrus.yml
index 1886690f..51057366 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -48,6 +48,7 @@ test_task:
     - name: "FreeBSD 14 Test"
       freebsd_instance:
         image_family: freebsd-14-0
+
     - name: "FreeBSD 13 Test"
       freebsd_instance:
         image_family: freebsd-13-3
@@ -67,9 +68,9 @@ test_task:
     - cargo clippy --all-targets --workspace --all-features -- -D warnings
   <<: *CLEANUP_TEMPLATE
 
-build_task:
+release_task:
   auto_cancellation: $CIRRUS_BRANCH == 'main'
-  only_if: $CIRRUS_BUILD_SOURCE == "api"
+  only_if: $CIRRUS_BUILD_SOURCE == "api" && $BTM_BUILD_RELEASE_CALLER == "ci"
   timeout_in: "30m"
   env:
     BTM_GENERATE: "true"
@@ -84,6 +85,7 @@ build_task:
       env:
         TARGET: "x86_64-unknown-freebsd"
         NAME: "x86_64-unknown-freebsd-14-0"
+
     - name: "FreeBSD 13 Build"
       alias: "freebsd_13_3_build"
       freebsd_instance:
@@ -91,6 +93,7 @@ build_task:
       env:
         TARGET: "x86_64-unknown-freebsd"
         NAME: "x86_64-unknown-freebsd-13-3"
+
     - name: "Legacy Linux (2.17)"
       alias: "linux_2_17_build"
       container:
diff --git a/.github/workflows/build_releases.yml b/.github/workflows/build_releases.yml
index cf1c661d..fdc332ca 100644
--- a/.github/workflows/build_releases.yml
+++ b/.github/workflows/build_releases.yml
@@ -296,7 +296,7 @@ jobs:
             raw=$(git branch -r --contains '${{ github.ref_name }}');
             BRANCH=${raw##*/};
           fi
-          python ./scripts/cirrus/build.py "$BRANCH" "release/" "${{ inputs.caller }}"
+          python ./scripts/cirrus/release.py "$BRANCH" "release/" "${{ inputs.caller }}"
 
       - name: Generate artifact attestation for file
         uses: actions/attest-build-provenance@v1
diff --git a/build.rs b/build.rs
index dc894181..df820396 100644
--- a/build.rs
+++ b/build.rs
@@ -84,7 +84,7 @@ fn nightly_version() {
     const ENV_KEY: &str = "BTM_BUILD_RELEASE_CALLER";
 
     match env::var_os(ENV_KEY) {
-        Some(var) if !var.is_empty() && var == "nightly" => {
+        Some(var) if !var.is_empty() && var == "ci" => {
             let version = env!("CARGO_PKG_VERSION");
 
             if let Some(hash) = extract_sha(option_env!("CIRRUS_CHANGE_IN_REPO")) {
diff --git a/scripts/cirrus/build.py b/scripts/cirrus/release.py
similarity index 95%
rename from scripts/cirrus/build.py
rename to scripts/cirrus/release.py
index 0a38ed47..eca85a86 100644
--- a/scripts/cirrus/build.py
+++ b/scripts/cirrus/release.py
@@ -34,7 +34,9 @@ def make_query_request(key: str, branch: str, build_type: str):
 
     # Dumb but if it works...
     config_override = (
-        Path(".cirrus.yml").read_text().replace("# -PLACEHOLDER FOR CI-", 'BTM_BUILD_RELEASE_CALLER: "nightly"')
+        Path(".cirrus.yml")
+        .read_text()
+        .replace("# -PLACEHOLDER FOR CI-", 'BTM_BUILD_RELEASE_CALLER: "ci"')
     )
     query = """
         mutation CreateCirrusCIBuild (
@@ -43,7 +45,7 @@ def make_query_request(key: str, branch: str, build_type: str):
             $mutation_id: String!,
             $config_override: String,
         ) {
-            createBuild(
+            createBuild (
                 input: {
                     repositoryId: $repo,
                     branch: $branch,
@@ -193,7 +195,11 @@ def main():
                         # Sleep for a minute if something went wrong, just in case.
                         sleep(60)
                 else:
-                    print("Build failed to complete after {} minutes, bailing.".format(MINUTES))
+                    print(
+                        "Build failed to complete after {} minutes, bailing.".format(
+                            MINUTES
+                        )
+                    )
 
         if not success:
             exit(2)