diff --git a/package-lock.json b/package-lock.json
index 60ab05fa..fb0baa40 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9848,7 +9848,7 @@
     },
     "packages/prerender-fargate": {
       "name": "@aligent/cdk-prerender-fargate",
-      "version": "2.3.5",
+      "version": "2.3.8",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@aws-cdk/aws-apigatewayv2-alpha": "2.30.0-alpha.0",
@@ -9864,7 +9864,7 @@
     },
     "packages/prerender-proxy": {
       "name": "@aligent/cdk-prerender-proxy",
-      "version": "2.0.0",
+      "version": "2.1.4",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@aligent/cdk-esbuild": "^2.0",
@@ -9924,7 +9924,7 @@
     },
     "packages/static-hosting": {
       "name": "@aligent/cdk-static-hosting",
-      "version": "2.3.1",
+      "version": "2.3.4",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@aligent/cdk-esbuild": "^2.0",
diff --git a/packages/prerender-fargate/lib/prerender/Dockerfile b/packages/prerender-fargate/lib/prerender/Dockerfile
index b92a339e..ae684002 100644
--- a/packages/prerender-fargate/lib/prerender/Dockerfile
+++ b/packages/prerender-fargate/lib/prerender/Dockerfile
@@ -4,19 +4,18 @@ ENV CHROME_BIN=/usr/bin/chromium-browser
 ENV CHROME_PATH=/usr/lib/chromium/
 ENV MEMORY_CACHE=0
 
-# install chromium, tini and clear cache
-RUN apk add --update-cache chromium tini \
- && rm -rf /var/cache/apk/* /tmp/*
+RUN apk add --no-cache chromium tini
 
 USER node
 WORKDIR "/home/node"
 
 COPY ./package.json .
-COPY ./server.js .
 
-# install npm packages
 RUN npm install --no-package-lock
 
+COPY ./server.js .
+COPY ./utils ./utils
+
 EXPOSE 3000
 
 HEALTHCHECK CMD netstat -ltn | grep -c 3000 
diff --git a/packages/prerender-fargate/lib/prerender/package.json b/packages/prerender-fargate/lib/prerender/package.json
index 62d6b33a..fd869781 100644
--- a/packages/prerender-fargate/lib/prerender/package.json
+++ b/packages/prerender-fargate/lib/prerender/package.json
@@ -7,6 +7,7 @@
     "start": "node server.js"
   },
   "dependencies": {
+    "pino": "^9.1.0",
     "prerender": "5.20.0",
     "prerender-aws-s3-cache": "1.0.1"
   }
diff --git a/packages/prerender-fargate/lib/prerender/server.js b/packages/prerender-fargate/lib/prerender/server.js
index 4a53da2a..24b45a1e 100644
--- a/packages/prerender-fargate/lib/prerender/server.js
+++ b/packages/prerender-fargate/lib/prerender/server.js
@@ -12,8 +12,24 @@
 'use strict';
 
 const prerender = require('prerender');
+const util = require('prerender/lib/util');
 const crypto = require('crypto');
 const s3Cache = require('prerender-aws-s3-cache');
+const logger = require('./utils/logger')
+
+/**
+ * Replace prerender's util log function with our own which uses pino to log
+ *
+ * @param  {...any} args 
+ * @returns 
+ */
+util.log = function (...args) {
+    if (process.env.DISABLE_LOGGING) {
+        return;
+    }
+
+    logger.info(args.join(' '));
+};
 
 const server = prerender({
     chromeFlags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-web-security', '--remote-debugging-port=9222', '--hide-scrollbars', '--disable-dev-shm-usage'],
@@ -21,6 +37,25 @@ const server = prerender({
     chromeLocation: '/usr/bin/chromium-browser'
 });
 
+server.use({
+    beforeSend: (req, res, next) => {
+        const ms = new Date().getTime() - req.prerender.start.getTime();
+
+        if (req.prerender.url !== "health") {
+            logger.render({
+                time: ms,
+                path: req.prerender.url,
+                status: req.prerender.statusCode,
+                ip: req.socket.remoteAddress,
+                headers: req.prerender.headers,
+                origin: req.headers
+            });
+        }
+
+        next();
+    },
+});
+
 const tokenJson = JSON.parse(process.env.TOKEN_SECRET);
 const tokens = Object.keys(tokenJson);
 
@@ -31,10 +66,12 @@ server.use({
         // Log "x-prerender-user-agent" value forwarded from CloudFront/Lambda@edge that contains the original User-Agent value. If not present, e.g. requests from ELB, default to "user-agent" value.
         const userAgent = req.get('x-prerender-user-agent') || req.get('user-agent');
 
-        console.log(`${new Date().toISOString()} User-Agent: "${userAgent}" ${req.prerender.reqId} ${req.prerender.url}`);
+        logger.info(`${new Date().toISOString()} User-Agent: "${userAgent}" ${req.prerender.reqId} ${req.prerender.url}`)
         let auth = req.headers['x-prerender-token'];
+
         if (!auth) {
-            console.log(`${new Date().toISOString()} "${userAgent}" ${req.prerender.reqId} Authentication header not found.`);
+            logger.info(`${new Date().toISOString()} "${userAgent}" ${req.prerender.reqId} Authentication header not found.`);
+
             return res.send(401);
         }
 
@@ -49,7 +86,7 @@ server.use({
             if (authenticated) break;
         }
         if (!authenticated) {
-            console.log(`${new Date().toISOString()} "${userAgent}" ${req.prerender.reqId} Authentication Failed.`);
+            logger.info(`${new Date().toISOString()} "${userAgent}" ${req.prerender.reqId} Authentication Failed.`);
             return res.send(401);
         }
 
@@ -82,14 +119,15 @@ server.use({
     requestReceived: function(req, res, next) {
             const fetchCachedObject = function (err, result) {
                 if (!err && result) {
-                    console.log(`Found cached object: ${key}`);
+                    logger.info(`Found cached object: ${key}`);
+
                     if (result.Metadata.location){
                         res.setHeader('Location', result.Metadata.location);
                     }
                     // default 200 for legacy objects that do not have Metadata.httpreturncode defined
                     return res.send(result.Metadata.httpreturncode || 200, result.Body);
                 } else {
-                    console.error(`Fetching cached object from S3 bucket failed with error: ${err.code}`);
+                    logger.error(`Fetching cached object from S3 bucket failed with error: ${err.code}`);
                 }
                 next();
             }
@@ -117,9 +155,9 @@ server.use({
         var s3Metadata = {}
         const cacheObject = function (err, result) {
             if (!err && result) {
-                console.log(`Cached object ${key} already present. Skipping caching...`);
+                logger.info(`Cached object ${key} already present. Skipping caching...`);
             } else {
-                console.log(`Caching the object ${req.prerender.url} with statusCode ${req.prerender.statusCode}`);
+                logger.info(`Caching the object ${req.prerender.url} with statusCode ${req.prerender.statusCode}`);
                 s3.putObject({
                     Key: key,
                     ContentType: 'text/html;charset=UTF-8',
@@ -127,11 +165,12 @@ server.use({
                     Body: req.prerender.content,
                     Metadata: s3Metadata
                 }, function(err, result) {
-                    console.log(result);
-                    if (err) console.error(err);
+                    logger.info(result);
+                    if (err) logger.error(err);
                 });
             }
         }
+
         // Inspect prerender meta tags and update response accordingly
         if (req.prerender.content && req.prerender.renderType == 'html') {
             const statusMatchRegex = /<meta[^<>]*(?:name=['"]prerender-status-code['"][^<>]*content=['"]([0-9]{3})['"]|content=['"]([0-9]{3})['"][^<>]*name=['"]prerender-status-code['"])[^<>]*>/i;
@@ -165,7 +204,7 @@ server.use({
                 }, cacheObject);
             } else {
                 // Skip caching for the http response codes not in the list, such as 404
-                console.log(`StatusCode ${req.prerender.statusCode} for ${req.prerender.url} is not in the cachable code list. Returning without caching the result.`);
+                logger.info(`StatusCode ${req.prerender.statusCode} for ${req.prerender.url} is not in the cachable code list. Returning without caching the result.`);
             }
 
             next();