diff --git a/Agent/Services/ConfigService.cs b/Agent/Services/ConfigService.cs
index dcce37d82..85a1a32c6 100644
--- a/Agent/Services/ConfigService.cs
+++ b/Agent/Services/ConfigService.cs
@@ -78,7 +78,7 @@ public ConnectionInfo GetConnectionInfo()
                 return new ConnectionInfo()
                 {
                     DeviceID = _debugGuid,
-                    Host = "http://localhost:5000",
+                    Host = "http://localhost:5001",
                     OrganizationID = AppConstants.DebugOrgId
                 };
             }
diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs
index 2a06b0316..ee667f80c 100644
--- a/Desktop.Linux/Program.cs
+++ b/Desktop.Linux/Program.cs
@@ -28,7 +28,7 @@ public static async Task Main(string[] args)
         var version = AppVersionHelper.GetAppVersion();
         var logger = new FileLogger("Remotely_Desktop", version, "Program.cs");
         var filePath = Environment.ProcessPath ?? Environment.GetCommandLineArgs().First();
-        var serverUrl = Debugger.IsAttached ? "http://localhost:5000" : string.Empty;
+        var serverUrl = Debugger.IsAttached ? "http://localhost:5001" : string.Empty;
         var getEmbeddedResult = EmbeddedServerDataProvider.Instance.TryGetEmbeddedData(filePath);
         if (getEmbeddedResult.IsSuccess)
         {
diff --git a/Server/Dockerfile.old b/Server/Dockerfile.old
index 986b2d521..1d2fdebdc 100644
--- a/Server/Dockerfile.old
+++ b/Server/Dockerfile.old
@@ -1,9 +1,9 @@
 FROM ubuntu:jammy
 
-EXPOSE 5000
+EXPOSE 5001
 
 ENV ASPNETCORE_ENVIRONMENT="Production"
-ENV ASPNETCORE_URLS="http://*:5000"
+ENV ASPNETCORE_URLS="http://*:5001"
 
 RUN \
   apt-get -y update && \
diff --git a/Server/Dockerfile.rootless b/Server/Dockerfile.rootless
index 3b288768e..005fc3002 100644
--- a/Server/Dockerfile.rootless
+++ b/Server/Dockerfile.rootless
@@ -1,9 +1,9 @@
 FROM ubuntu:jammy
 
-EXPOSE 5000
+EXPOSE 5001
 
 ENV ASPNETCORE_ENVIRONMENT="Production"
-ENV ASPNETCORE_URLS="http://*:5000"
+ENV ASPNETCORE_URLS="http://*:5001"
 
 RUN \
   apt-get -y update && \
diff --git a/Server/Properties/launchSettings.json b/Server/Properties/launchSettings.json
index 57f7d3acb..7977635a7 100644
--- a/Server/Properties/launchSettings.json
+++ b/Server/Properties/launchSettings.json
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "dotnetRunMessages": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+      "applicationUrl": "http://localhost:5001"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -29,7 +29,7 @@
       "launchBrowser": true,
       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
       "environmentVariables": {
-        "ASPNETCORE_URLS": "http://*:5000"
+        "ASPNETCORE_URLS": "http://*:5001"
       },
       "publishAllPorts": true,
       "useSSL": false
diff --git a/Utilities/Example_Apache_Config.txt b/Utilities/Example_Apache_Config.txt
index 8b6a8ec30..cf5dcb09b 100644
--- a/Utilities/Example_Apache_Config.txt
+++ b/Utilities/Example_Apache_Config.txt
@@ -6,34 +6,34 @@
 	#Forward once Websocket Connection has been upgraded.
 	RewriteEngine On
 	RewriteCond %{HTTP:Upgrade} =websocket [NC]
-	RewriteRule /(.*)           ws://localhost:5000/$1 [P,L]
+	RewriteRule /(.*)           ws://localhost:5001/$1 [P,L]
 	RewriteCond %{HTTP:Upgrade} !=websocket [NC]
-	RewriteRule /(.*)           http://localhost:5000/$1 [P,L]
+	RewriteRule /(.*)           http://localhost:5001/$1 [P,L]
 
 	ProxyPreserveHost On
 	#Proxy Requests to Remotely Server
 	<LocationMatch "/">
-		ProxyPass http://localhost:5000/ 
-		ProxyPassReverse http://localhost:5000/
+		ProxyPass http://localhost:5001/ 
+		ProxyPassReverse http://localhost:5001/
 	</LocationMatch>
 	<Location "/hubs/user">
-		ProxyPass http://localhost:5000/
-		ProxyPassReverse http://localhost:5000/
+		ProxyPass http://localhost:5001/
+		ProxyPassReverse http://localhost:5001/
 	</Location>
 
 	<LocationMatch "/hubs/service">
-		ProxyPass http://localhost:5000/
-		ProxyPassReverse http://localhost:5000/
+		ProxyPass http://localhost:5001/
+		ProxyPassReverse http://localhost:5001/
 	</LocationMatch>
 
 	<LocationMatch "/hubs/viewer">
-		ProxyPass http://localhost:5000/
-		ProxyPassReverse http://localhost:5000/
+		ProxyPass http://localhost:5001/
+		ProxyPassReverse http://localhost:5001/
 	</LocationMatch>
 
 	<LocationMatch "/hubs/desktop">
-		ProxyPass http://localhost:5000/
-		ProxyPassReverse http://localhost:5000/
+		ProxyPass http://localhost:5001/
+		ProxyPassReverse http://localhost:5001/
 	</LocationMatch>
 
         ErrorLog ${APACHE_LOG_DIR}/error.log
diff --git a/Utilities/Example_Nginx_Config.txt b/Utilities/Example_Nginx_Config.txt
index 0b82a5c86..df89c1102 100644
--- a/Utilities/Example_Nginx_Config.txt
+++ b/Utilities/Example_Nginx_Config.txt
@@ -2,7 +2,7 @@ server {
     listen        80;
     server_name   app.example.com *.app.example.com;
     location / {
-        proxy_pass         http://localhost:5000;
+        proxy_pass         http://localhost:5001;
         proxy_http_version 1.1;
         proxy_set_header   Upgrade $http_upgrade;
         proxy_set_header   Connection keep-alive;
@@ -12,7 +12,7 @@ server {
         proxy_set_header   X-Forwarded-Proto $scheme;
     }
     location /_blazor {	
-        proxy_pass http://localhost:5000;	
+        proxy_pass http://localhost:5001;	
         proxy_http_version 1.1;	
         proxy_set_header Upgrade $http_upgrade;	
         proxy_set_header Connection "upgrade";	
@@ -22,7 +22,7 @@ server {
         proxy_set_header   X-Forwarded-Proto $scheme;	
     }	
     location /AgentHub {	
-        proxy_pass http://localhost:5000;	
+        proxy_pass http://localhost:5001;	
         proxy_http_version 1.1;	
         proxy_set_header Upgrade $http_upgrade;	
         proxy_set_header Connection "upgrade";	
@@ -32,7 +32,7 @@ server {
         proxy_set_header   X-Forwarded-Proto $scheme;	
     }	
     location /ViewerHub {	
-        proxy_pass http://localhost:5000;	
+        proxy_pass http://localhost:5001;	
         proxy_http_version 1.1;	
         proxy_set_header Upgrade $http_upgrade;	
         proxy_set_header Connection "upgrade";	
@@ -42,7 +42,7 @@ server {
         proxy_set_header   X-Forwarded-Proto $scheme;	
     }	
     location /CasterHub {	
-        proxy_pass http://localhost:5000;	
+        proxy_pass http://localhost:5001;	
         proxy_http_version 1.1;	
         proxy_set_header Upgrade $http_upgrade;	
         proxy_set_header Connection "upgrade";	
diff --git a/docker-compose/docker-compose.override.yml b/docker-compose/docker-compose.override.yml
index 85dce487b..466ecb15d 100644
--- a/docker-compose/docker-compose.override.yml
+++ b/docker-compose/docker-compose.override.yml
@@ -5,10 +5,8 @@ services:
   remotely:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_HTTP_PORTS=5000
-      - ASPNETCORE_HTTPS_PORTS=5001
+      - ASPNETCORE_HTTP_PORTS=5001
     ports:
-      - "5000:5000"
       - "5001:5001"
     volumes:
       - ${APPDATA}/Microsoft/UserSecrets:/home/app/.microsoft/usersecrets:ro
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index ae9391a2a..e992eb371 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -17,13 +17,13 @@ services:
       - /var/www/remotely:/app/AppData
     restart: unless-stopped
     ports:
-      - "5000:5000"
+      - "5001:5001"
     networks:
       - remotely
     environment:
       # ASPNETCORE environment variables should *not* be changed.
       - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_HTTP_PORTS=5000
+      - ASPNETCORE_HTTP_PORTS=5001
 
       # Other ASP.NET Core configurations can be overridden here, such as Logging.
       # See https://learn.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-8.0