diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5cf2d13b91..45f01b58b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -642,8 +642,6 @@ jobs:
         name: Build device-util.exe
       - run: ${{ env.GO_BUILD_CMD }} ./cmd/ncproxy
         name: Build ncproxy.exe
-      - run: ${{ env.GO_BUILD_CMD }} ./cmd/hvsocketaddr
-        name: Build hvsocketaddr.exe
       - run: ${{ env.GO_BUILD_CMD }} ./internal/tools/grantvmgroupaccess
         name: Build grantvmgroupaccess.exe
       - run: ${{ env.GO_BUILD_CMD }} ./internal/tools/networkagent
@@ -659,6 +657,8 @@ jobs:
         name: Build uvmboot.exe
       - run: ${{ env.GO_BUILD_CMD }} ./internal/tools/zapdir
         name: Build zapdir.exe
+      - run: ${{ env.GO_BUILD_CMD }} ./internal/tools/hvsocketaddr
+        name: Build hvsocketaddr.exe
 
       - uses: actions/upload-artifact@v4
         if: ${{ github.event_name == 'pull_request' }}
diff --git a/cmd/hvsocketaddr/README.md b/internal/tools/hvsocketaddr/README.md
similarity index 94%
rename from cmd/hvsocketaddr/README.md
rename to internal/tools/hvsocketaddr/README.md
index d0f6719e1d..439ab120f9 100644
--- a/cmd/hvsocketaddr/README.md
+++ b/internal/tools/hvsocketaddr/README.md
@@ -7,7 +7,7 @@ querying HCS isn't an option.
 ## Build
 Build the binary as following
 ```powershell
-> go build ./cmd/hvsocketaddr
+> go build ./internal/tools/hvsocketaddr
 ```
 
 ## Run
diff --git a/cmd/hvsocketaddr/main.go b/internal/tools/hvsocketaddr/main.go
similarity index 100%
rename from cmd/hvsocketaddr/main.go
rename to internal/tools/hvsocketaddr/main.go