diff --git a/.github/workflows/alpha-deployment.yml b/.github/workflows/alpha-deployment.yml
index b410d99a7..d1888155f 100644
--- a/.github/workflows/alpha-deployment.yml
+++ b/.github/workflows/alpha-deployment.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   validations:
     name: Validate permissions
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check permissions
         run: |
diff --git a/.github/workflows/beta-deployment.yml b/.github/workflows/beta-deployment.yml
index b2d8b54e1..7b5485a06 100644
--- a/.github/workflows/beta-deployment.yml
+++ b/.github/workflows/beta-deployment.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   validations:
     name: Validate permissions
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check permissions
         run: |
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 5cc31d542..2d0be32cd 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -27,7 +27,7 @@ jobs:
     #   - https://gh.io/supported-runners-and-hardware-resources
     #   - https://gh.io/using-larger-runners (GitHub.com only)
     # Consider using larger runners or machines with greater resources for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-22.04' }}
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-24.04' }}
     permissions:
       # required for all workflows
       security-events: write
diff --git a/.github/workflows/images-without-dependencies.yml b/.github/workflows/images-without-dependencies.yml
index 3138a0e0d..292eda718 100644
--- a/.github/workflows/images-without-dependencies.yml
+++ b/.github/workflows/images-without-dependencies.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   prepare_deployment:
     name: Prepare deployment - ${{inputs.microservice}}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       tech: ${{ steps.get_tech.outputs.tech }}
     steps:
diff --git a/.github/workflows/principal-installer-release.yml b/.github/workflows/principal-installer-release.yml
index 4219861ba..d9d9bda70 100644
--- a/.github/workflows/principal-installer-release.yml
+++ b/.github/workflows/principal-installer-release.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Check out code into the right branch
       uses: actions/checkout@v4
diff --git a/.github/workflows/principal-multi-env.yml b/.github/workflows/principal-multi-env.yml
index c6b474042..3561be85a 100644
--- a/.github/workflows/principal-multi-env.yml
+++ b/.github/workflows/principal-multi-env.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   setup_deployment:
     name: Setup Deployment
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       env_version: ${{ steps.set-env.outputs.env_version }}
       microservices: ${{ steps.filter.outputs.changes }}
@@ -94,3 +94,4 @@ jobs:
       microservice: ${{ matrix.service }}
       environment: ${{ needs.setup_deployment.outputs.env_version }}
     secrets: inherit
+  
diff --git a/.github/workflows/production-deployment.yml b/.github/workflows/production-deployment.yml
index 44f2624cd..5f1e7f2ce 100644
--- a/.github/workflows/production-deployment.yml
+++ b/.github/workflows/production-deployment.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   validations:
     name: Validate permissions
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check permissions
         run: |
diff --git a/.github/workflows/rc-deployment.yml b/.github/workflows/rc-deployment.yml
index aa8d072da..891551b63 100644
--- a/.github/workflows/rc-deployment.yml
+++ b/.github/workflows/rc-deployment.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   validations:
     name: Validate permissions
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check permissions
         run: |
diff --git a/.github/workflows/used-docker-basic.yml b/.github/workflows/used-docker-basic.yml
index 8ff3e9833..0bc45de74 100644
--- a/.github/workflows/used-docker-basic.yml
+++ b/.github/workflows/used-docker-basic.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code into the right branch
         uses: actions/checkout@v4
diff --git a/.github/workflows/used-docker-frontend.yml b/.github/workflows/used-docker-frontend.yml
index 46cc71f36..e4cd815dc 100644
--- a/.github/workflows/used-docker-frontend.yml
+++ b/.github/workflows/used-docker-frontend.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/used-docker-golang.yml b/.github/workflows/used-docker-golang.yml
index 030c49261..33ec599a6 100644
--- a/.github/workflows/used-docker-golang.yml
+++ b/.github/workflows/used-docker-golang.yml
@@ -20,7 +20,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code into the right branch
         uses: actions/checkout@v4
diff --git a/.github/workflows/used-docker-java-11-new.yml b/.github/workflows/used-docker-java-11-new.yml
index d91f9d358..3145fa91b 100644
--- a/.github/workflows/used-docker-java-11-new.yml
+++ b/.github/workflows/used-docker-java-11-new.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code into the right branch
         uses: actions/checkout@v4
diff --git a/.github/workflows/used-docker-java-11.yml b/.github/workflows/used-docker-java-11.yml
index b7776a851..ec8357142 100644
--- a/.github/workflows/used-docker-java-11.yml
+++ b/.github/workflows/used-docker-java-11.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code into the right branch
         uses: actions/checkout@v4
diff --git a/.github/workflows/used-docker-java.yml b/.github/workflows/used-docker-java.yml
index e83065642..d9d47cdc5 100644
--- a/.github/workflows/used-docker-java.yml
+++ b/.github/workflows/used-docker-java.yml
@@ -10,7 +10,7 @@ on:
         type: string
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code into the right branch
         uses: actions/checkout@v4
diff --git a/.github/workflows/used-runner.yml b/.github/workflows/used-runner.yml
index 7d6fb965f..cea5e73f8 100644
--- a/.github/workflows/used-runner.yml
+++ b/.github/workflows/used-runner.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   prepare_deployment:
     name: Prepare deployment - ${{inputs.microservice}}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       tech: ${{ steps.get_tech.outputs.tech }}
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1740cac41..544de8d50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,6 @@
 -- Fixed issue where tabs remained open when navigating outside the Log Explorer scope to improve user experience.
 -- Fixed time filter issue where the date range was not applied correctly.
 -- Fixed incorrect query behavior when filtering incidents by ID.
--- Agent Services force update opening necessary ports
-
 
 ## New Features and Improvements
 -- Added organization name in app settings to distinguish alert and notification emails for better clarity.
diff --git a/agent-manager/Dockerfile b/agent-manager/Dockerfile
index a42a9d2b1..5a10b895d 100644
--- a/agent-manager/Dockerfile
+++ b/agent-manager/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM FROM ubuntu:24.04
 
 COPY agent-manager /app/
 COPY ./dependencies/agent/ /dependencies/agent/
diff --git a/aws/Dockerfile b/aws/Dockerfile
index 790dd98d6..9ead8f8cd 100644
--- a/aws/Dockerfile
+++ b/aws/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM FROM ubuntu:24.04
 
 RUN apt-get update
 RUN apt-get install -y ca-certificates
diff --git a/bitdefender/Dockerfile b/bitdefender/Dockerfile
index 3c78ac32e..ed1123adb 100644
--- a/bitdefender/Dockerfile
+++ b/bitdefender/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM FROM ubuntu:24.04
 
 RUN apt-get update
 RUN apt-get install -y ca-certificates
diff --git a/correlation/Dockerfile b/correlation/Dockerfile
index 15bfc8274..b3436229e 100644
--- a/correlation/Dockerfile
+++ b/correlation/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM FROM ubuntu:24.04
 RUN apt-get update
 RUN apt-get install -y ca-certificates git wget
 COPY correlation /app/
diff --git a/log-auth-proxy/Dockerfile b/log-auth-proxy/Dockerfile
index c07c28bec..f35e8d051 100644
--- a/log-auth-proxy/Dockerfile
+++ b/log-auth-proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM FROM ubuntu:24.04
 
 COPY log-auth-proxy /app/
 
diff --git a/office365/Dockerfile b/office365/Dockerfile
index ea2014650..fbc582bef 100644
--- a/office365/Dockerfile
+++ b/office365/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM FROM ubuntu:24.04
 
 RUN apt-get update
 RUN apt-get install -y ca-certificates
diff --git a/sophos/Dockerfile b/sophos/Dockerfile
index 52c4eec81..d2a897f2c 100644
--- a/sophos/Dockerfile
+++ b/sophos/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM FROM ubuntu:24.04
 
 RUN apt-get update
 RUN apt-get install -y ca-certificates