diff --git a/.github/workflows/image-build-and-publish.yml b/.github/workflows/image-build-and-publish.yml
index e82a00da..64addde9 100644
--- a/.github/workflows/image-build-and-publish.yml
+++ b/.github/workflows/image-build-and-publish.yml
@@ -53,6 +53,8 @@ jobs:
         uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
 
       - name: Build and Push Image to GHCR
+        env:
+          GOFLAGS: "-ldflags=-s -w -X github.com/stacklok/toolhive/pkg/versions.Version=${{ steps.version-string.outputs.tag }} -X github.com/stacklok/toolhive/pkg/versions.Commit=${{ github.sha }} -X github.com/stacklok/toolhive/pkg/versions.BuildDate=${{ github.event.head_commit.timestamp }} -X github.com/stacklok/toolhive/pkg/versions.BuildType=release"
         run: |
           TAG=$(echo "${{ steps.version-string.outputs.tag }}" | sed 's/+/_/g')
           TAGS="-t $TAG"
@@ -209,6 +211,8 @@ jobs:
         uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
 
       - name: Build and Push Image to GHCR
+        env:
+          GOFLAGS: "-ldflags=-s -w -X github.com/stacklok/toolhive/pkg/versions.Version=${{ steps.version-string.outputs.tag }} -X github.com/stacklok/toolhive/pkg/versions.Commit=${{ github.sha }} -X github.com/stacklok/toolhive/pkg/versions.BuildDate=${{ github.event.head_commit.timestamp }} -X github.com/stacklok/toolhive/pkg/versions.BuildType=release"
         run: |
           TAG=$(echo "${{ steps.version-string.outputs.tag }}" | sed 's/+/_/g')
           TAGS="-t $TAG"
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index b132f6de..47e7fbc1 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -14,6 +14,7 @@ builds:
       - "-X github.com/stacklok/toolhive/pkg/versions.Version={{ .Env.VERSION }}"
       - "-X github.com/stacklok/toolhive/pkg/versions.Commit={{ .Env.COMMIT }}"
       - "-X github.com/stacklok/toolhive/pkg/versions.BuildDate={{ .Date }}"
+      - "-X github.com/stacklok/toolhive/pkg/versions.BuildType=release"
     goos:
       - linux
       - windows
diff --git a/cmd/thv-operator/main.go b/cmd/thv-operator/main.go
index d84d18a4..a51128fa 100644
--- a/cmd/thv-operator/main.go
+++ b/cmd/thv-operator/main.go
@@ -24,6 +24,7 @@ import (
 	"github.com/stacklok/toolhive/cmd/thv-operator/controllers"
 	"github.com/stacklok/toolhive/pkg/logger"
 	"github.com/stacklok/toolhive/pkg/operator/telemetry"
+	"github.com/stacklok/toolhive/pkg/versions"
 )
 
 var (
@@ -92,13 +93,15 @@ func main() {
 		os.Exit(1)
 	}
 
-	// Set up telemetry service - only runs when elected as leader
-	telemetryService := telemetry.NewService(mgr.GetClient(), "")
-	if err := mgr.Add(&telemetry.LeaderTelemetryRunnable{
-		TelemetryService: telemetryService,
-	}); err != nil {
-		setupLog.Error(err, "unable to add telemetry runnable")
-		os.Exit(1)
+	// Set up telemetry service - only runs when elected as leader and BuildType is "release"
+	if versions.BuildType == "release" {
+		telemetryService := telemetry.NewService(mgr.GetClient(), "")
+		if err := mgr.Add(&telemetry.LeaderTelemetryRunnable{
+			TelemetryService: telemetryService,
+		}); err != nil {
+			setupLog.Error(err, "unable to add telemetry runnable")
+			os.Exit(1)
+		}
 	}
 
 	setupLog.Info("starting manager")
diff --git a/cmd/thv/main.go b/cmd/thv/main.go
index 783d31bc..02494555 100644
--- a/cmd/thv/main.go
+++ b/cmd/thv/main.go
@@ -7,14 +7,16 @@ import (
 	"github.com/stacklok/toolhive/cmd/thv/app"
 	"github.com/stacklok/toolhive/pkg/container"
 	"github.com/stacklok/toolhive/pkg/logger"
+	"github.com/stacklok/toolhive/pkg/versions"
 )
 
 func main() {
 	// Initialize the logger
 	logger.Initialize()
 
-	// Skip update check for completion command or if we are running in kubernetes
-	if err := app.NewRootCmd(!app.IsCompletionCommand(os.Args) && !container.IsKubernetesRuntime()).Execute(); err != nil {
+	// Skip update check for completion command, if we are running in kubernetes, or if BuildType is not "release"
+	enableUpdates := !app.IsCompletionCommand(os.Args) && !container.IsKubernetesRuntime() && versions.BuildType == "release"
+	if err := app.NewRootCmd(enableUpdates).Execute(); err != nil {
 		os.Exit(1)
 	}
 }
diff --git a/pkg/updates/client.go b/pkg/updates/client.go
index a538e413..52442eb1 100644
--- a/pkg/updates/client.go
+++ b/pkg/updates/client.go
@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
 	"time"
+
+	"github.com/stacklok/toolhive/pkg/versions"
 )
 
 // VersionClient is an interface for calling the update service API.
@@ -49,14 +50,18 @@ func (d *defaultVersionClient) GetLatestVersion(instanceID string, currentVersio
 	}
 
 	// Set headers
-	userAgent := fmt.Sprintf("toolhive/%s", currentVersion)
+	// Determine user agent based on build type
+	var userAgent string
+	if versions.BuildType == "release" {
+		userAgent = fmt.Sprintf("toolhive/%s", currentVersion)
+	} else {
+		userAgent = fmt.Sprintf("toolhive/development-%s", currentVersion)
+	}
+
+	// Add suffix
 	if d.userAgentSuffix != "" {
 		userAgent += " " + d.userAgentSuffix
 	}
-	// Add `dev` to the user agent for Stacklok devs.
-	if os.Getenv("TOOLHIVE_DEV") != "" {
-		userAgent += " dev"
-	}
 	req.Header.Set(instanceIDHeader, instanceID)
 	req.Header.Set(userAgentHeader, userAgent)
 
diff --git a/pkg/versions/version.go b/pkg/versions/version.go
index 8ebcc529..d172f7b8 100644
--- a/pkg/versions/version.go
+++ b/pkg/versions/version.go
@@ -23,6 +23,9 @@ var (
 	// BuildDate is the date when the binary was built
 	// nolint:goconst // This is a placeholder for the build date
 	BuildDate = unknownStr
+	// BuildType indicates if this is a release build.
+	// Set to "release" only in official release builds, everything else is considered "development".
+	BuildType = "development"
 )
 
 // VersionInfo represents the version information