diff --git a/.github/workflows/ci_main_docker.yaml b/.github/workflows/ci_main_docker.yaml
index 14744165b..ded4bf594 100644
--- a/.github/workflows/ci_main_docker.yaml
+++ b/.github/workflows/ci_main_docker.yaml
@@ -3,7 +3,7 @@ name: ci_main_docker
 on:
   push:
     branches:
-      - "main"
+      - "1.4.x-development-base-arm"
 jobs:
   build:
     name: Build Docker image
diff --git a/Docker/docker-compose.development-http.yaml b/Docker/docker-compose.development-http.yaml
index 6d17b67a6..0217cd609 100644
--- a/Docker/docker-compose.development-http.yaml
+++ b/Docker/docker-compose.development-http.yaml
@@ -8,7 +8,7 @@ services:
       - Settings:UseHttp=true
       - Settings:FoxIDsEndpoint=http://localhost:8800    
     ports:
-      - 8800:80
+      - 8800:8800
   foxids-control:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development  
@@ -18,7 +18,7 @@ services:
       - Settings:FoxIDsBackendEndpoint=http://foxids
       - Settings:FoxIDsControlEndpoint=http://localhost:8801 
     ports:
-      - 8801:80
+      - 8801:8800
   # mongodb: # optionally expose MongoDB on port 27017
   #   ports:
   #     - 27017:27017
diff --git a/Docker/docker-compose.development-https.yaml b/Docker/docker-compose.development-https.yaml
index 7da54bde0..78bf24b8c 100644
--- a/Docker/docker-compose.development-https.yaml
+++ b/Docker/docker-compose.development-https.yaml
@@ -6,10 +6,10 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=https://+;http://+
       - https_port=44330
-      - Settings:FoxIDsEndpoint=https://localhost:44330
+      - Settings:FoxIDsEndpoint=https://localhost:8400
     ports:
-      - 8800:80
-      - 44330:443
+      - 8800:8800
+      - 8400:8400
     volumes:
       - ${APPDATA}/Microsoft/UserSecrets:/home/app/.microsoft/usersecrets:ro
       - ${APPDATA}/ASP.NET/Https:/home/app/.aspnet/https:ro
@@ -18,12 +18,12 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=https://+;http://+
       - https_port=44331
-      - Settings:FoxIDsEndpoint=https://localhost:44330
+      - Settings:FoxIDsEndpoint=https://localhost:8400
       - Settings:FoxIDsBackendEndpoint=https://foxids
-      - Settings:FoxIDsControlEndpoint=https://localhost:44331
+      - Settings:FoxIDsControlEndpoint=https://localhost:8401
     ports:
-      - 8801:80
-      - 44331:443
+      - 8801:8800
+      - 8401:8400
     volumes:
       - ${APPDATA}/Microsoft/UserSecrets:/home/app/.microsoft/usersecrets:ro
       - ${APPDATA}/ASP.NET/Https:/home/app/.aspnet/https:ro
diff --git a/Kubernetes/k8s-foxids-deployment.yaml b/Kubernetes/k8s-foxids-deployment.yaml
index 8858065da..19d11264e 100644
--- a/Kubernetes/k8s-foxids-deployment.yaml
+++ b/Kubernetes/k8s-foxids-deployment.yaml
@@ -18,7 +18,7 @@ spec:
         - name: foxids
           image: foxids/foxids:latest
           ports:
-            - containerPort: 8000
+            - containerPort: 8800
           env:
             - name: "ASPNETCORE_URLS"
               value: "http://+"
@@ -81,7 +81,7 @@ spec:
         - name: foxids-control
           image: foxids/foxids-control:latest
           ports:
-            - containerPort: 8000
+            - containerPort: 8800
           env:
             - name: "ASPNETCORE_URLS"
               value: "http://+"
@@ -90,7 +90,7 @@ spec:
             - name: "Settings__FoxIDsEndpoint"
               value: "https://id.itfoxtec.com" # change to your domain -  https://id.my-domain.com
             - name: "Settings__FoxIDsBackendEndpoint"
-              value: "http://foxids:8000"
+              value: "http://foxids:8810"
             - name: "Settings__FoxIDsControlEndpoint"
               value: "https://control.itfoxtec.com" # change to your domain -  https://control.my-domain.com
             - name: "Settings__MasterSeedEnabled"
@@ -138,8 +138,8 @@ spec:
   ports:
     - name: http
       protocol: TCP
-      port: 8000
-      targetPort: 8000
+      port: 8810
+      targetPort: 8800
 ---
 apiVersion: v1
 kind: Service
@@ -153,7 +153,7 @@ spec:
     - name: http
       protocol: TCP
       port: 8800
-      targetPort: 8000
+      targetPort: 8800
 ---
 apiVersion: v1
 kind: Service
@@ -167,4 +167,4 @@ spec:
     - name: http
       protocol: TCP
       port: 8801
-      targetPort: 8000
\ No newline at end of file
+      targetPort: 8800
\ No newline at end of file
diff --git a/azuredeploy.json b/azuredeploy.json
index 32e60f7e2..33718632f 100644
--- a/azuredeploy.json
+++ b/azuredeploy.json
@@ -369,7 +369,6 @@
       },
       "properties": {
         "siteConfig": {
-          "linuxFxVersion": "DOCKER|index.docker.io/foxids/foxids:latest",
           "ftpsState": "Disabled",
           "alwaysOn": false,
           "autoSwapSlotName": "production"
@@ -396,7 +395,6 @@
       },
       "properties": {
         "siteConfig": {
-          "linuxFxVersion": "DOCKER|index.docker.io/foxids/foxids-control:latest",
           "ftpsState": "Disabled",
           "alwaysOn": false,
           "autoSwapSlotName": "production"
diff --git a/src/FoxIDs.Control/Dockerfile b/src/FoxIDs.Control/Dockerfile
index eb0b40419..4804d82f8 100644
--- a/src/FoxIDs.Control/Dockerfile
+++ b/src/FoxIDs.Control/Dockerfile
@@ -1,12 +1,11 @@
 FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 USER app
 WORKDIR /app
-EXPOSE 80
-EXPOSE 443
+EXPOSE 8800
+EXPOSE 8400
 
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
-#ARG BUILD_CONFIGURATION=Debug
 WORKDIR /src
 COPY ["src/FoxIDs.Control/FoxIDs.Control.csproj", "FoxIDs.Control/"]
 COPY ["src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj", "FoxIDs.ControlClient/"]
@@ -20,7 +19,6 @@ RUN dotnet build "FoxIDs.Control.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
-#ARG BUILD_CONFIGURATION=Debug
 RUN dotnet publish "FoxIDs.Control.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
diff --git a/src/FoxIDs/Dockerfile b/src/FoxIDs/Dockerfile
index bf4eef098..4108f4cb4 100644
--- a/src/FoxIDs/Dockerfile
+++ b/src/FoxIDs/Dockerfile
@@ -1,12 +1,11 @@
 FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 USER app
 WORKDIR /app
-EXPOSE 80
-EXPOSE 443
+EXPOSE 8800
+EXPOSE 8400
 
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
-#ARG BUILD_CONFIGURATION=Debug
 WORKDIR /src
 COPY ["src/FoxIDs/FoxIDs.csproj", "FoxIDs/"]
 COPY ["src/FoxIDs.Shared/FoxIDs.Shared.csproj", "FoxIDs.Shared/"]
@@ -18,7 +17,6 @@ RUN dotnet build "FoxIDs.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
-#ARG BUILD_CONFIGURATION=Debug
 RUN dotnet publish "FoxIDs.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
 FROM base AS final