diff --git a/apps/frontend/src/components/cluster-topology/cluster-node.tsx b/apps/frontend/src/components/cluster-topology/cluster-node.tsx
index c7e8a34e..db24429c 100644
--- a/apps/frontend/src/components/cluster-topology/cluster-node.tsx
+++ b/apps/frontend/src/components/cluster-topology/cluster-node.tsx
@@ -43,8 +43,8 @@ export function ClusterNode({
       const connectionDetails: ConnectionDetails = {
         host: primary.host,
         port: primary.port.toString(),
-        ...(primary.username && primary.password && {
-          username: primary.username,
+        ...(primary.password && {
+          username: primary.username ?? "",
           password: await secureStorage.encrypt(primary.password),
         }),
         tls: primary.tls,
diff --git a/docker/Dockerfile.app b/docker/Dockerfile.app
index a3517a83..ff4cfa06 100644
--- a/docker/Dockerfile.app
+++ b/docker/Dockerfile.app
@@ -16,6 +16,9 @@ RUN npm run build:all
 # -------- Production Runtime --------
 FROM node:22-bookworm-slim
 
+# Install CA certificates for TLS connections to ElastiCache
+RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates && rm -rf /var/lib/apt/lists/*
+
 WORKDIR /app
 
 ENV NODE_ENV=production