diff --git a/cmd/agent/core/agent.go b/cmd/agent/core/agent.go
index b3ff2d43f0b..3122c8f4b32 100644
--- a/cmd/agent/core/agent.go
+++ b/cmd/agent/core/agent.go
@@ -65,6 +65,8 @@ var (
 )
 
 func run(ctx context.Context, c *cli.Command, backends []types.Backend) error {
+	log.Info().Msgf("Woodpecker Agent Version: %s", version.String())
+
 	agentCtx, ctxCancel := context.WithCancelCause(ctx)
 	stopAgentFunc = func(err error) {
 		msg := "shutdown of whole agent"
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
index 8b1854aec86..36cac479710 100644
--- a/cmd/agent/main.go
+++ b/cmd/agent/main.go
@@ -25,6 +25,7 @@ import (
 	"go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/local"
 	backendTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types"
 	"go.woodpecker-ci.org/woodpecker/v3/shared/utils"
+	"go.woodpecker-ci.org/woodpecker/v3/version"
 )
 
 var backends = []backendTypes.Backend{
@@ -34,6 +35,8 @@ var backends = []backendTypes.Backend{
 }
 
 func main() {
+	log.Info().Msgf("Woodpecker Agent Version: %s", version.String())
+
 	ctx := utils.WithContextSigtermCallback(context.Background(), func() {
 		log.Info().Msg("termination signal is received, shutting down agent")
 	})
diff --git a/cmd/agent/version.go b/cmd/agent/version.go
new file mode 100644
index 00000000000..4f9e394c44d
--- /dev/null
+++ b/cmd/agent/version.go
@@ -0,0 +1,5 @@
+// agent/version.go
+package main
+
+// Version is injected at build time using -ldflags
+var Version = "unknown"
diff --git a/version/version.go b/version/version.go
deleted file mode 100644
index 67e495188d9..00000000000
--- a/version/version.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2019 Laszlo Fogas
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// cSpell:ignore ldflags
-
-package version
-
-// Version of Woodpecker, set with ldflags, from Git tag.
-var Version string
-
-// String returns the Version set at build time or "dev".
-func String() string {
-	if Version == "" {
-		return "dev"
-	}
-
-	return Version
-}