diff --git a/internal/cmd/base/base.go b/internal/cmd/base/base.go
index 3380850fe6..86156ab916 100644
--- a/internal/cmd/base/base.go
+++ b/internal/cmd/base/base.go
@@ -116,7 +116,7 @@ type Command struct {
 	FlagSkipCacheDaemon  bool
 	FlagSkipClientAgent  bool
 
-	FlagClientAgentPort uint64
+	FlagClientAgentPort uint16
 
 	FlagScopeId           string
 	FlagScopeName         string
@@ -500,7 +500,7 @@ func (c *Command) FlagSet(bit FlagSetBit) *FlagSets {
 				Hidden:  true,
 			})
 
-			f.Uint64Var(&Uint64Var{
+			f.Uint16Var(&Uint16Var{
 				Name:    "client-agent-port",
 				Target:  &c.FlagClientAgentPort,
 				Default: 9300,
diff --git a/internal/cmd/base/servers.go b/internal/cmd/base/servers.go
index 6621c384bc..185d7a55df 100644
--- a/internal/cmd/base/servers.go
+++ b/internal/cmd/base/servers.go
@@ -122,7 +122,7 @@ type Server struct {
 	DevSecondaryTargetId             string // Target using host sources.
 	DevHostAddress                   string // Host address for target using host sources.
 	DevTargetAddress                 string // Network address for target with address.
-	DevTargetDefaultPort             int64
+	DevTargetDefaultPort             uint16
 	DevTargetSessionMaxSeconds       int64
 	DevTargetSessionConnectionLimit  int64
 	DevLoopbackPluginId              string
diff --git a/internal/cmd/commands/clientagentcmd/addtoken.go b/internal/cmd/commands/clientagentcmd/addtoken.go
index 22e44a0dab..3c424b3b3e 100644
--- a/internal/cmd/commands/clientagentcmd/addtoken.go
+++ b/internal/cmd/commands/clientagentcmd/addtoken.go
@@ -30,7 +30,7 @@ type UpsertTokenRequest struct {
 // The passed in cli.Ui is used to print out any errors when looking up the
 // auth token from the keyring. This allows background operations calling this
 // method to pass in a silent UI to suppress any output.
-func addToken(ctx context.Context, apiClient *api.Client, port uint64) (*api.Response, *api.Error, error) {
+func addToken(ctx context.Context, apiClient *api.Client, port uint16) (*api.Response, *api.Error, error) {
 	pa := UpsertTokenRequest{
 		BoundaryAddr: apiClient.Addr(),
 	}
diff --git a/internal/cmd/commands/clientagentcmd/clientagentcmd.go b/internal/cmd/commands/clientagentcmd/clientagentcmd.go
index a8b79eb204..5ebf2a04c0 100644
--- a/internal/cmd/commands/clientagentcmd/clientagentcmd.go
+++ b/internal/cmd/commands/clientagentcmd/clientagentcmd.go
@@ -67,6 +67,6 @@ func (c *ClientAgentCommand) Run(args []string) int {
 }
 
 // clientAgentUrl constructs the full URL for a client agent request given a port and path.
-func clientAgentUrl(port uint64, path string) string {
+func clientAgentUrl(port uint16, path string) string {
 	return fmt.Sprintf("http://localhost:%d/%s", port, path)
 }
diff --git a/internal/cmd/commands/clientagentcmd/pause.go b/internal/cmd/commands/clientagentcmd/pause.go
index 9a6f2e6dbf..7957c28475 100644
--- a/internal/cmd/commands/clientagentcmd/pause.go
+++ b/internal/cmd/commands/clientagentcmd/pause.go
@@ -53,7 +53,7 @@ func (c *PauseCommand) Flags() *base.FlagSets {
 		Usage:  "Instead of executing the request, print an equivalent cURL command string and exit.",
 	})
 
-	f.Uint64Var(&base.Uint64Var{
+	f.Uint16Var(&base.Uint16Var{
 		Name:    "client-agent--port",
 		Target:  &c.FlagClientAgentPort,
 		Default: 9300,
diff --git a/internal/cmd/commands/clientagentcmd/resume.go b/internal/cmd/commands/clientagentcmd/resume.go
index 9434a71b4f..7d89c3dd0d 100644
--- a/internal/cmd/commands/clientagentcmd/resume.go
+++ b/internal/cmd/commands/clientagentcmd/resume.go
@@ -53,7 +53,7 @@ func (c *ResumeCommand) Flags() *base.FlagSets {
 		Usage:  "Instead of executing the request, print an equivalent cURL command string and exit.",
 	})
 
-	f.Uint64Var(&base.Uint64Var{
+	f.Uint16Var(&base.Uint16Var{
 		Name:    "client-agent-port",
 		Target:  &c.FlagClientAgentPort,
 		Default: 9300,
diff --git a/internal/cmd/commands/clientagentcmd/sessions.go b/internal/cmd/commands/clientagentcmd/sessions.go
index fdc9f86634..ea2d02ec96 100644
--- a/internal/cmd/commands/clientagentcmd/sessions.go
+++ b/internal/cmd/commands/clientagentcmd/sessions.go
@@ -58,7 +58,7 @@ func (c *SessionsCommand) Flags() *base.FlagSets {
 		Usage:  "Instead of executing the request, print an equivalent cURL command string and exit.",
 	})
 
-	f.Uint64Var(&base.Uint64Var{
+	f.Uint16Var(&base.Uint16Var{
 		Name:    "client-agent-port",
 		Target:  &c.FlagClientAgentPort,
 		Default: 9300,
diff --git a/internal/cmd/commands/clientagentcmd/status.go b/internal/cmd/commands/clientagentcmd/status.go
index 1a34a220d0..118c0cc30d 100644
--- a/internal/cmd/commands/clientagentcmd/status.go
+++ b/internal/cmd/commands/clientagentcmd/status.go
@@ -54,7 +54,7 @@ func (c *StatusCommand) Flags() *base.FlagSets {
 		Usage:  "Instead of executing the request, print an equivalent cURL command string and exit.",
 	})
 
-	f.Uint64Var(&base.Uint64Var{
+	f.Uint16Var(&base.Uint16Var{
 		Name:    "client-agent-port",
 		Target:  &c.FlagClientAgentPort,
 		Default: 9300,
diff --git a/internal/cmd/commands/dev/dev.go b/internal/cmd/commands/dev/dev.go
index e2a74511a2..77bc225c69 100644
--- a/internal/cmd/commands/dev/dev.go
+++ b/internal/cmd/commands/dev/dev.go
@@ -76,7 +76,7 @@ type Command struct {
 	flagIdSuffix                                       string
 	flagSecondaryIdSuffix                              string
 	flagHostAddress                                    string
-	flagTargetDefaultPort                              int64
+	flagTargetDefaultPort                              uint16
 	flagTargetSessionMaxSeconds                        int64
 	flagTargetSessionConnectionLimit                   int64
 	flagControllerApiListenAddr                        string
@@ -219,7 +219,7 @@ func (c *Command) Flags() *base.FlagSets {
 		Usage:   "Address to use for the default host that is created. Must be a bare host or IP address, no port.",
 	})
 
-	f.Int64Var(&base.Int64Var{
+	f.Uint16Var(&base.Uint16Var{
 		Name:    "target-default-port",
 		Default: 22,
 		Target:  &c.flagTargetDefaultPort,