diff --git a/com.unity.netcode.gameobjects/Documentation~/TableOfContents.md b/com.unity.netcode.gameobjects/Documentation~/TableOfContents.md
index c96c88503b..9f2e272be2 100644
--- a/com.unity.netcode.gameobjects/Documentation~/TableOfContents.md
+++ b/com.unity.netcode.gameobjects/Documentation~/TableOfContents.md
@@ -19,6 +19,7 @@
     * [Max players](basics/maxnumberplayers.md)
   * [Transports](advanced-topics/transports.md)
   * [Relay](relay/relay.md)
+  * Command line arguments
 * [Network components](network-components.md)
   * [Core components](components/core/corecomponents.md)
     * [NetworkObject](components/core/networkobject.md)
diff --git a/com.unity.netcode.gameobjects/Documentation~/basics/maxnumberplayers.md b/com.unity.netcode.gameobjects/Documentation~/basics/maxnumberplayers.md
index fa5ca5add4..ead258bfab 100644
--- a/com.unity.netcode.gameobjects/Documentation~/basics/maxnumberplayers.md
+++ b/com.unity.netcode.gameobjects/Documentation~/basics/maxnumberplayers.md
@@ -21,7 +21,7 @@ if( m_Portal.NetManager.ConnectedClientsIds.Count >= CharSelectData.k_MaxLobbyPl
 }
 ```
 
-> [!NOTE]​
+> [!NOTE]
 > In connection approval delegate, Netcode for GameObjects doesn't support sending anything more than a Boolean back.
 
 <!-- Commenting this out until we can get external code references working
diff --git a/com.unity.netcode.gameobjects/Documentation~/command-line-arguments.md b/com.unity.netcode.gameobjects/Documentation~/command-line-arguments.md
new file mode 100644
index 0000000000..5aa3ad4d29
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Documentation~/command-line-arguments.md
@@ -0,0 +1,24 @@
+# WORK IN PROGRESS
+# Command line arguments
+
+You can use [command line arguments](https://docs.unity3d.com/Documentation/Manual/CommandLineArguments.html) to configure some aspects of your game. With dedicated server you can use command line arguments to override default ip address and port. 
+
+
+
+Something you can use if you want to launch a standalone build (particulary usefull for dedicated server builds)
+(include all known command line )
+-port
+-ip (TODO) check where is the endpoint, I may only need to assign it with no convert
+
+
+we provided port and ip and you can add your own command line args and retieve them in the CommanLineOptions class and grab them in your project by using GetArgs
+
+[!Note]
+Adding a command line argument requires that you retrieve and set that command line argument
+
+
+
+
+You can force override the command line arguments by using the optional boolean argument in SetConnectionData(string, ushort, string, bool) from UnityTransport.
+
+~~~~
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Documentation~/configuration.md b/com.unity.netcode.gameobjects/Documentation~/configuration.md
index 16ef3242e5..bd31dda289 100644
--- a/com.unity.netcode.gameobjects/Documentation~/configuration.md
+++ b/com.unity.netcode.gameobjects/Documentation~/configuration.md
@@ -2,8 +2,9 @@
 
 Configure your Netcode for GameObjects project.
 
-| **Topic**                       | **Description**                  |
-| :------------------------------ | :------------------------------- |
-| **[Configuring connections](configure-connections.md)** | Configure connections in your project. |
-| **[Transports](advanced-topics/transports.md)**| Transport layers establish communication between your application and different hosts in a network. |
-| **[Relay](relay/relay.md)**| Use Unity Relay with Netcode for GameObjects. |
\ No newline at end of file
+| **Topic**                                               | **Description**                                                                                     |
+|:--------------------------------------------------------|:----------------------------------------------------------------------------------------------------|
+| **[Configuring connections](configure-connections.md)** | Configure connections in your project.                                                              |
+| **[Transports](advanced-topics/transports.md)**         | Transport layers establish communication between your application and different hosts in a network. |
+| **[Relay](relay/relay.md)**                             | Use Unity Relay with Netcode for GameObjects.                                                       |
+| **[Command line arguments](command-line-arguments.md)** | Use command line arguments.                                                                         |
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/Configuration/CommandLineOptions.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/CommandLineOptions.cs
new file mode 100644
index 0000000000..f3e0680ad4
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Configuration/CommandLineOptions.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.Netcode
+{
+    /// <summary>
+    /// This class contains a list of the application instance domain's command line arguments that
+    /// are used when entering PlayMode or the build is executed.
+    /// </summary>
+    public class CommandLineOptions
+    {
+        /// <summary>
+        /// Command Line Options Singleton
+        /// </summary>
+        public static CommandLineOptions Instance { get; private set; } = null!;
+
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void RuntimeInitializeOnLoad() => Instance = new CommandLineOptions();
+
+        // Contains the current application instance domain's command line arguments
+        internal static List<string> CommandLineArguments = new List<string>();
+
+        // Invoked upon application start
+        [RuntimeInitializeOnLoadMethod]
+        private static void ParseCommandLineArguments()
+        {
+            // Get all the command line arguments to be parsed later and/or modified
+            // prior to being parsed (for testing purposes).
+            CommandLineArguments = new List<string>(Environment.GetCommandLineArgs());
+        }
+
+        /// <summary>
+        /// Returns the value of an argument or null if there the argument is not present
+        /// </summary>
+        /// <param name="arg">The name of the argument</param>
+        /// <returns><see cref="string"/>Value of the command line argument passed in.</returns>
+        public string GetArg(string arg)
+        {
+            var argIndex = CommandLineArguments.IndexOf(arg);
+            if (argIndex >= 0 && argIndex < CommandLineArguments.Count - 1)
+            {
+                return CommandLineArguments[argIndex + 1];
+            }
+            return null;
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/Configuration/CommandLineOptions.cs.meta b/com.unity.netcode.gameobjects/Runtime/Configuration/CommandLineOptions.cs.meta
new file mode 100644
index 0000000000..600f7651ba
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Configuration/CommandLineOptions.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: fa53b6fefb5f8804f9ed888e50b03722
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
index 50a6304f52..069f31b5b4 100644
--- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
@@ -976,19 +976,6 @@ public NetworkPrefabHandler PrefabHandler
         internal NetworkConnectionManager ConnectionManager = new NetworkConnectionManager();
         internal NetworkMessageManager MessageManager = null;
 
-        internal struct Override<T>
-        {
-            private T m_Value;
-            public bool Overidden { get; private set; }
-            internal T Value
-            {
-                get { return Overidden ? m_Value : default(T); }
-                set { Overidden = true; m_Value = value; }
-            }
-        };
-
-        internal Override<ushort> PortOverride;
-
         /// <summary>
         /// Determines if the NetworkManager's GameObject is parented under another GameObject and
         /// notifies the user that this is not allowed for the NetworkManager.
@@ -1168,8 +1155,6 @@ internal void Initialize(bool server)
                 return;
             }
 
-            ParseCommandLineOptions();
-
             if (NetworkConfig.NetworkTransport == null)
             {
                 if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
@@ -1740,40 +1725,6 @@ private void OnDestroy()
 #endif
         }
 
-        // Command line options
-        private const string k_OverridePortArg = "-port";
-
-        private string GetArg(string[] commandLineArgs, string arg)
-        {
-            var argIndex = Array.IndexOf(commandLineArgs, arg);
-            if (argIndex >= 0 && argIndex < commandLineArgs.Length - 1)
-            {
-                return commandLineArgs[argIndex + 1];
-            }
-
-            return null;
-        }
-
-        private void ParseArg<T>(string arg, ref Override<T> value)
-        {
-            if (GetArg(Environment.GetCommandLineArgs(), arg) is string argValue)
-            {
-                value.Value = (T)Convert.ChangeType(argValue, typeof(T));
-            }
-        }
-
-        private void ParseCommandLineOptions()
-        {
-#if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT
-            if ( UnityEngine.DedicatedServer.Arguments.Port != null)
-            {
-                PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port;
-            }
-#else
-            ParseArg(k_OverridePortArg, ref PortOverride);
-#endif
-        }
-
 #if UNITY_EDITOR
         internal static INetworkManagerHelper NetworkManagerHelper;
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
index 2f3c987ab2..afe2021a96 100644
--- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
@@ -805,14 +805,43 @@ public void SetClientRelayData(string ipAddress, ushort port, byte[] allocationI
             SetRelayServerData(ipAddress, port, allocationId, key, connectionData, hostConnectionData, isSecure);
         }
 
+        // Command line options
+        private const string k_OverridePortArg = "-port";
+
+        private bool ParseCommandLineOptions(out ushort port)
+        {
+#if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT
+            if (UnityEngine.DedicatedServer.Arguments.Port != null)
+            {
+                port = (ushort)UnityEngine.DedicatedServer.Arguments.Port;
+                return true;
+            }
+#else
+            if (CommandLineOptions.Instance.GetArg(k_OverridePortArg) is string argValue)
+            {
+                port = (ushort)Convert.ChangeType(argValue, typeof(ushort));
+                return true;
+            }
+#endif
+            port = default;
+            return false;
+        }
+
         /// <summary>
         /// Sets IP and Port information. This will be ignored if using the Unity Relay and you should call <see cref="SetRelayServerData"/>
         /// </summary>
         /// <param name="ipv4Address">The remote IP address (despite the name, can be an IPv6 address or a domain name).</param>
         /// <param name="port">The remote port to connect to.</param>
         /// <param name="listenAddress">The address the server is going to listen on.</param>
-        public void SetConnectionData(string ipv4Address, ushort port, string listenAddress = null)
+        /// <param name="forceOverrideCommandLineArgs">When true, any command line arguments will be ignored.</param>
+        public void SetConnectionData(string ipv4Address, ushort port, string listenAddress = null, bool forceOverrideCommandLineArgs = false)
         {
+            m_HasForcedConnectionData = forceOverrideCommandLineArgs;
+            if (!forceOverrideCommandLineArgs && ParseCommandLineOptions(out var commandLinePort))
+            {
+                port = commandLinePort;
+            }
+
             ConnectionData = new ConnectionAddressData
             {
                 Address = ipv4Address,
@@ -1566,6 +1595,11 @@ protected override string GetDisconnectEventMessage(DisconnectEvents disconnectE
             return m_UnityTransportNotificationHandler.GetDisconnectEventMessage(disconnectEvent);
         }
 
+        /// <summary>
+        /// This is set in <see cref="SetConnectionData(string, ushort, string, bool)"/>
+        /// </summary>
+        private bool m_HasForcedConnectionData;
+
         /// <summary>
         /// Initializes the transport
         /// </summary>
@@ -1579,12 +1613,16 @@ public override void Initialize(NetworkManager networkManager = null)
                 return;
             }
 #endif
-
             m_NetworkManager = networkManager;
 
-            if (m_NetworkManager && m_NetworkManager.PortOverride.Overidden)
+            //If the port doesn't have a forced value and is set by a command line option, override it.
+            if (!m_HasForcedConnectionData && ParseCommandLineOptions(out var port))
             {
-                ConnectionData.Port = m_NetworkManager.PortOverride.Value;
+                if (m_NetworkManager?.LogLevel <= LogLevel.Developer)
+                {
+                    Debug.Log($"The port is set by a command line option. Using following connection data: {ConnectionData.Address}:{port}");
+                }
+                ConnectionData.Port = port;
             }
 
             m_RealTimeProvider = m_NetworkManager ? m_NetworkManager.RealTimeProvider : new RealTimeProvider();