diff --git a/agent-manager/Dockerfile b/agent-manager/Dockerfile
index 8435564ac..fc24f3388 100644
--- a/agent-manager/Dockerfile
+++ b/agent-manager/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 COPY agent-manager /app/
 COPY ./dependencies/agent/ /dependencies/agent/
@@ -6,8 +6,8 @@ COPY ./dependencies/collector/ /dependencies/collector/
 
 # Install jq
 RUN apt-get update && \
-    apt-get install -y jq && \
-    apt-get install -y wget && \
+    apt-get install -y ca-certificates jq wget && \
+    update-ca-certificates && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/aws/Dockerfile b/aws/Dockerfile
index 8de052faf..3f0aae8a8 100644
--- a/aws/Dockerfile
+++ b/aws/Dockerfile
@@ -1,6 +1,8 @@
-FROM ubuntu:latest
+FROM ubuntu:24.04
 
-RUN apt update
+RUN apt-get update
+RUN apt-get install -y ca-certificates
+RUN update-ca-certificates
 
 COPY aws .
 
diff --git a/bitdefender/Dockerfile b/bitdefender/Dockerfile
index d5f5c3d75..827c1138b 100644
--- a/bitdefender/Dockerfile
+++ b/bitdefender/Dockerfile
@@ -1,6 +1,8 @@
-FROM ubuntu:latest
+FROM ubuntu:24.04
 
-RUN apt update
+RUN apt-get update
+RUN apt-get install -y ca-certificates
+RUN update-ca-certificates
 
 COPY bitdefender .
 
diff --git a/log-auth-proxy/Dockerfile b/log-auth-proxy/Dockerfile
index ed9c7c0e4..ac3a11969 100644
--- a/log-auth-proxy/Dockerfile
+++ b/log-auth-proxy/Dockerfile
@@ -1,11 +1,11 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 COPY log-auth-proxy /app/
 
 # Install jq
 RUN apt-get update && \
-    apt-get install -y jq && \
-    apt-get install -y wget && \
+    apt-get install -y ca-certificates jq wget && \
+    update-ca-certificates && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/office365/Dockerfile b/office365/Dockerfile
index 5208d5af7..4c51570bc 100644
--- a/office365/Dockerfile
+++ b/office365/Dockerfile
@@ -1,6 +1,8 @@
-FROM ubuntu:latest
+FROM ubuntu:24.04
 
-RUN apt update
+RUN apt-get update
+RUN apt-get install -y ca-certificates
+RUN update-ca-certificates
 
 COPY office365 .
 
diff --git a/sophos/Dockerfile b/sophos/Dockerfile
index 1c3834142..a6d1936e1 100644
--- a/sophos/Dockerfile
+++ b/sophos/Dockerfile
@@ -1,6 +1,8 @@
-FROM ubuntu:latest
+FROM ubuntu:24.04
 
-RUN apt update
+RUN apt-get update
+RUN apt-get install -y ca-certificates
+RUN update-ca-certificates
 
 COPY sophos .