diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 05299febe..05a64a143 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -238,7 +238,7 @@ jobs:
           tags: ${{ env.STRETCH_TAG }}
           tag_with_ref: false
           add_git_labels: true
-          build_args: STACKS_NODE_VERSION=${{ github.event.inputs.tag || env.GITHUB_SHA_SHORT }},GIT_BRANCH=${{ env.GITHUB_REF_SHORT }},GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
+          build_args: SUBNET_NODE_VERSION=${{ github.event.inputs.tag || env.GITHUB_SHA_SHORT }},GIT_BRANCH=${{ env.GITHUB_REF_SHORT }},GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
           # Only push if a tag was passed in
           push: ${{ github.event.inputs.tag != '' }}
 
@@ -282,6 +282,6 @@ jobs:
           tags: ${{ env.STRETCH_TAG }}
           tag_with_ref: false
           add_git_labels: true
-          build_args: STACKS_NODE_VERSION=${{ github.event.inputs.tag || env.GITHUB_SHA_SHORT }},GIT_BRANCH=${{ env.GITHUB_REF_SHORT }},GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
+          build_args: SUBNET_NODE_VERSION=${{ github.event.inputs.tag || env.GITHUB_SHA_SHORT }},GIT_BRANCH=${{ env.GITHUB_REF_SHORT }},GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
           # Only push if a tag was passed in
           push: ${{ github.event.inputs.tag != '' }}
diff --git a/.github/workflows/docker-platforms.yml b/.github/workflows/docker-platforms.yml
index 7ee44b3ed..0d95154ff 100644
--- a/.github/workflows/docker-platforms.yml
+++ b/.github/workflows/docker-platforms.yml
@@ -59,7 +59,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            STACKS_NODE_VERSION=${{ inputs.tag || env.GITHUB_SHA_SHORT }}
+            SUBNET_NODE_VERSION=${{ inputs.tag || env.GITHUB_SHA_SHORT }}
             GIT_BRANCH=${{ env.GITHUB_REF_SHORT }}
             GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
           push: true
@@ -119,7 +119,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            STACKS_NODE_VERSION=${{ inputs.tag || env.GITHUB_SHA_SHORT }}
+            SUBNET_NODE_VERSION=${{ inputs.tag || env.GITHUB_SHA_SHORT }}
             GIT_BRANCH=${{ env.GITHUB_REF_SHORT }}
             GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
           push: true
diff --git a/Dockerfile b/Dockerfile
index 0ebb1ef13..f75a48306 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM rust:bullseye as build
 
-ARG STACKS_NODE_VERSION="No Version Info"
+ARG SUBNET_NODE_VERSION="No Version Info"
 ARG GIT_BRANCH='No Branch Info'
 ARG GIT_COMMIT='No Commit Info'
 
diff --git a/Dockerfile.stretch b/Dockerfile.stretch
index 3d94e58fb..e7a96f381 100644
--- a/Dockerfile.stretch
+++ b/Dockerfile.stretch
@@ -1,6 +1,6 @@
 FROM rust:stretch as build
 
-ARG STACKS_NODE_VERSION="No Version Info"
+ARG SUBNET_NODE_VERSION="No Version Info"
 ARG GIT_BRANCH='No Branch Info'
 ARG GIT_COMMIT='No Commit Info'
 
diff --git a/build-scripts/Dockerfile.linux-arm64 b/build-scripts/Dockerfile.linux-arm64
index 7acc30f6b..e9fd5cdc7 100644
--- a/build-scripts/Dockerfile.linux-arm64
+++ b/build-scripts/Dockerfile.linux-arm64
@@ -1,6 +1,6 @@
 FROM rust:stretch as build
 
-ARG STACKS_NODE_VERSION="No Version Info"
+ARG SUBNET_NODE_VERSION="No Version Info"
 ARG GIT_BRANCH='No Branch Info'
 ARG GIT_COMMIT='No Commit Info'
 
diff --git a/build-scripts/Dockerfile.linux-armv7 b/build-scripts/Dockerfile.linux-armv7
index 9fb50d18b..481f05f15 100644
--- a/build-scripts/Dockerfile.linux-armv7
+++ b/build-scripts/Dockerfile.linux-armv7
@@ -1,6 +1,6 @@
 FROM rust:stretch as build
 
-ARG STACKS_NODE_VERSION="No Version Info"
+ARG SUBNET_NODE_VERSION="No Version Info"
 ARG GIT_BRANCH='No Branch Info'
 ARG GIT_COMMIT='No Commit Info'
 
diff --git a/build-scripts/Dockerfile.linux-musl-x64 b/build-scripts/Dockerfile.linux-musl-x64
index 9c6c60434..1827bb26e 100644
--- a/build-scripts/Dockerfile.linux-musl-x64
+++ b/build-scripts/Dockerfile.linux-musl-x64
@@ -1,6 +1,6 @@
 FROM rust:stretch as build
 
-ARG STACKS_NODE_VERSION="No Version Info"
+ARG SUBNET_NODE_VERSION="No Version Info"
 ARG GIT_BRANCH='No Branch Info'
 ARG GIT_COMMIT='No Commit Info'
 
diff --git a/build-scripts/Dockerfile.linux-x64 b/build-scripts/Dockerfile.linux-x64
index b4abb08ae..32dc4fd77 100644
--- a/build-scripts/Dockerfile.linux-x64
+++ b/build-scripts/Dockerfile.linux-x64
@@ -1,6 +1,6 @@
 FROM rust:stretch as build
 
-ARG STACKS_NODE_VERSION="No Version Info"
+ARG SUBNET_NODE_VERSION="No Version Info"
 ARG GIT_BRANCH='No Branch Info'
 ARG GIT_COMMIT='No Commit Info'
 
diff --git a/build-scripts/Dockerfile.macos-arm64 b/build-scripts/Dockerfile.macos-arm64
index 56cfe684a..f92be18e0 100644
--- a/build-scripts/Dockerfile.macos-arm64
+++ b/build-scripts/Dockerfile.macos-arm64
@@ -1,6 +1,6 @@
 FROM rust:bullseye as build
 
-ARG STACKS_NODE_VERSION="No Version Info"
+ARG SUBNET_NODE_VERSION="No Version Info"
 ARG GIT_BRANCH='No Branch Info'
 ARG GIT_COMMIT='No Commit Info'
 
diff --git a/build-scripts/Dockerfile.macos-x64 b/build-scripts/Dockerfile.macos-x64
index 29038b696..a50f7614d 100644
--- a/build-scripts/Dockerfile.macos-x64
+++ b/build-scripts/Dockerfile.macos-x64
@@ -1,6 +1,6 @@
 FROM rust:bullseye as build
 
-ARG STACKS_NODE_VERSION="No Version Info"
+ARG SUBNET_NODE_VERSION="No Version Info"
 ARG GIT_BRANCH='No Branch Info'
 ARG GIT_COMMIT='No Commit Info'
 
diff --git a/build-scripts/Dockerfile.windows-x64 b/build-scripts/Dockerfile.windows-x64
index 58785ccba..31ba3868a 100644
--- a/build-scripts/Dockerfile.windows-x64
+++ b/build-scripts/Dockerfile.windows-x64
@@ -1,6 +1,6 @@
 FROM rust:stretch as build
 
-ARG STACKS_NODE_VERSION="No Version Info"
+ARG SUBNET_NODE_VERSION="No Version Info"
 ARG GIT_BRANCH='No Branch Info'
 ARG GIT_COMMIT='No Commit Info'
 
diff --git a/src/net/rpc.rs b/src/net/rpc.rs
index 7c5d53f69..5f467c31d 100644
--- a/src/net/rpc.rs
+++ b/src/net/rpc.rs
@@ -219,8 +219,8 @@ impl RPCPeerInfoData {
         genesis_chainstate_hash: &Sha256Sum,
     ) -> RPCPeerInfoData {
         let server_version = version_string(
-            "stacks-node",
-            option_env!("STACKS_NODE_VERSION")
+            "subnet-node",
+            option_env!("SUBNET_NODE_VERSION")
                 .or(option_env!("CARGO_PKG_VERSION"))
                 .unwrap_or("0.0.0.0"),
         );
diff --git a/testnet/stacks-node/src/main.rs b/testnet/stacks-node/src/main.rs
index c0769abc2..4525e9946 100644
--- a/testnet/stacks-node/src/main.rs
+++ b/testnet/stacks-node/src/main.rs
@@ -149,8 +149,8 @@ fn main() {
 
 fn version() -> String {
     stacks::version_string(
-        "stacks-node",
-        option_env!("STACKS_NODE_VERSION")
+        "subnet-node",
+        option_env!("SUBNET_NODE_VERSION")
             .or(option_env!("CARGO_PKG_VERSION"))
             .unwrap_or("0.0.0.0"),
     )