diff --git a/internal/app/cmd/register.go b/internal/app/cmd/register.go
index e980cb15..1203a849 100644
--- a/internal/app/cmd/register.go
+++ b/internal/app/cmd/register.go
@@ -230,9 +230,9 @@ func initInputs(regArgs *registerArgs) (*registerInputs, error) {
 		token = envToken
 	}
 	inputs := &registerInputs{
-		InstanceAddr: regArgs.InstanceAddr,
-		Token:        token,
-		RunnerName:   regArgs.RunnerName,
+		InstanceAddr: strings.TrimSpace(regArgs.InstanceAddr),
+		Token:        strings.TrimSpace(token),
+		RunnerName:   strings.TrimSpace(regArgs.RunnerName),
 		Ephemeral:    regArgs.Ephemeral,
 	}
 	regArgs.Labels = strings.TrimSpace(regArgs.Labels)
diff --git a/internal/app/cmd/register_test.go b/internal/app/cmd/register_test.go
index 5442d16d..72b22495 100644
--- a/internal/app/cmd/register_test.go
+++ b/internal/app/cmd/register_test.go
@@ -184,9 +184,9 @@ func TestInitInputs(t *testing.T) {
 	t.Run("valid token", func(t *testing.T) {
 		t.Setenv(registerTokenEnvVar, "from-env")
 		inputs, err := initInputs(&registerArgs{
-			InstanceAddr: "http://localhost:3000",
-			Token:        "from-plain-arg",
-			RunnerName:   "runner",
+			InstanceAddr: " http://localhost:3000 ",
+			Token:        "from-plain-arg\n",
+			RunnerName:   "runner\n",
 			Ephemeral:    true,
 			Labels:       " ubuntu:host , ubuntu:docker://node:18 ",
 		})
@@ -203,7 +203,7 @@ func TestInitInputs(t *testing.T) {
 		tokenFile, createErr := os.CreateTemp(t.TempDir(), "from-file")
 		require.NoError(t, createErr)
 		defer tokenFile.Close()
-		_, writeErr := tokenFile.WriteString("from-file")
+		_, writeErr := tokenFile.WriteString("from-file\n")
 		require.NoError(t, writeErr)
 		_ = tokenFile.Sync()