diff --git a/src/services/dashboard/templateDashboard.txt b/src/services/dashboard/templateDashboard.txt
index a057ba8535..c2f4b21843 100644
--- a/src/services/dashboard/templateDashboard.txt
+++ b/src/services/dashboard/templateDashboard.txt
@@ -3,7 +3,7 @@
         {
             "height": 3,
             "width": 6,
-            "y": 0,
+            "y": 86,
             "x": 6,
             "type": "custom",
             "properties": {
@@ -18,18 +18,18 @@
         {
             "height": 1,
             "width": 24,
-            "y": 3,
+            "y": 60,
             "x": 0,
             "type": "text",
             "properties": {
-                "markdown": "## cloudfront metrics",
+                "markdown": "# ui-infra",
                 "background": "transparent"
             }
         },
         {
             "height": 3,
             "width": 6,
-            "y": 0,
+            "y": 86,
             "x": 0,
             "type": "text",
             "properties": {
@@ -40,7 +40,7 @@
         {
             "height": 8,
             "width": 8,
-            "y": 48,
+            "y": 78,
             "x": 0,
             "type": "metric",
             "properties": {
@@ -61,59 +61,34 @@
             }
         },
         {
-            "height": 7,
-            "width": 8,
-            "y": 40,
+            "height": 3,
+            "width": 5,
+            "y": 2,
             "x": 0,
             "type": "alarm",
             "properties": {
-                "title": "Mako Dashboard ${sls:stage} Alarms",
+                "title": "Alarms",
                 "alarms": [
-                    "arn:aws:cloudwatch:${env:REGION_A}:${aws:accountId}:alarm:om-api-lambda-search-${sls:stage}-errors",
-                    "arn:aws:cloudwatch:${env:REGION_A}:${aws:accountId}:alarm:om-data-${sls:stage}-sinkOnemacErrorCount",
-                    "arn:aws:cloudwatch:${env:REGION_A}:${aws:accountId}:alarm:om-data-${sls:stage}-ONEMAC-validation-error",
-                    "arn:aws:cloudwatch:${env:REGION_A}:${aws:accountId}:alarm:om-data-${sls:stage}-SEATOOL-validation-error",
-                    "arn:aws:cloudwatch:${env:REGION_A}:${aws:accountId}:alarm:om-data-${sls:stage}-sinkSeatoolErrorsCount"
+                    "arn:aws:cloudwatch:${env:REGION_A}:${aws:accountId}:alarm:om-data-${sls:stage}-sinkSeatoolErrorsCount",
+                    "arn:aws:cloudwatch:${env:REGION_A}:${aws:accountId}:alarm:om-data-${sls:stage}-SEATOOL-validation-error"
                 ]
             }
         },
-        {
-            "height": 1,
-            "width": 8,
-            "y": 20,
-            "x": 0,
-            "type": "text",
-            "properties": {
-                "markdown": "## api gateway",
-                "background": "transparent"
-            }
-        },
-        {
-            "height": 1,
-            "width": 9,
-            "y": 39,
-            "x": 0,
-            "type": "text",
-            "properties": {
-                "markdown": "## opensearch",
-                "background": "transparent"
-            }
-        },
         {
             "height": 1,
             "width": 24,
-            "y": 47,
+            "y": 77,
             "x": 0,
             "type": "text",
             "properties": {
-                "markdown": "## alerts service",
+                "markdown": "# alerts",
                 "background": "transparent"
             }
         },
         {
             "height": 2,
             "width": 12,
-            "y": 21,
+            "y": 18,
             "x": 0,
             "type": "alarm",
             "properties": {
@@ -127,7 +102,7 @@
         {
             "height": 16,
             "width": 24,
-            "y": 23,
+            "y": 20,
             "x": 0,
             "type": "explorer",
             "properties": {
@@ -177,7 +152,7 @@
         {
             "height": 16,
             "width": 24,
-            "y": 4,
+            "y": 61,
             "x": 0,
             "type": "explorer",
             "properties": {
@@ -223,6 +198,425 @@
                 "region": "${env:REGION_A}",
                 "title": "Cloudfront Metric Explorer"
             }
+        },
+        {
+            "height": 1,
+            "width": 24,
+            "y": 0,
+            "x": 0,
+            "type": "text",
+            "properties": {
+                "markdown": "# data",
+                "background": "transparent"
+            }
+        },
+        {
+            "height": 7,
+            "width": 6,
+            "y": 2,
+            "x": 5,
+            "type": "metric",
+            "properties": {
+                "metrics": [
+                    [
+                        "AWS/Lambda",
+                        "Invocations",
+                        "FunctionName",
+                        "om-data-${sls:stage}-sinkSeatool",
+                        {
+                            "region": "${env:REGION_A}"
+                        }
+                    ],
+                    [
+                        ".",
+                        "Throttles",
+                        ".",
+                        ".",
+                        {
+                            "region": "${env:REGION_A}"
+                        }
+                    ],
+                    [
+                        ".",
+                        "Errors",
+                        ".",
+                        ".",
+                        {
+                            "region": "${env:REGION_A}",
+                            "color": "#d62728"
+                        }
+                    ]
+                ],
+                "view": "timeSeries",
+                "stacked": false,
+                "region": "${env:REGION_A}",
+                "title": "Lambda",
+                "period": 60,
+                "stat": "Sum"
+            }
+        },
+        {
+            "height": 7,
+            "width": 13,
+            "y": 2,
+            "x": 11,
+            "type": "log",
+            "properties": {
+                "query": "SOURCE '/aws/lambda/om-data-${sls:stage}-sinkSeatool' | fields @timestamp, @message\n| sort @timestamp desc\n| limit 50",
+                "region": "${env:REGION_A}",
+                "stacked": false,
+                "title": "Logs",
+                "view": "table"
+            }
+        },
+        {
+            "height": 7,
+            "width": 6,
+            "y": 10,
+            "x": 5,
+            "type": "metric",
+            "properties": {
+                "metrics": [
+                    [
+                        "AWS/Lambda",
+                        "Invocations",
+                        "FunctionName",
+                        "om-data-${sls:stage}-sinkOnemac",
+                        {
+                            "region": "${env:REGION_A}"
+                        }
+                    ],
+                    [
+                        ".",
+                        "Throttles",
+                        ".",
+                        ".",
+                        {
+                            "region": "${env:REGION_A}"
+                        }
+                    ],
+                    [
+                        ".",
+                        "Errors",
+                        ".",
+                        ".",
+                        {
+                            "region": "${env:REGION_A}",
+                            "color": "#d62728"
+                        }
+                    ]
+                ],
+                "view": "timeSeries",
+                "stacked": false,
+                "region": "${env:REGION_A}",
+                "title": "Lambda",
+                "period": 60,
+                "stat": "Sum"
+            }
+        },
+        {
+            "height": 7,
+            "width": 13,
+            "y": 10,
+            "x": 11,
+            "type": "log",
+            "properties": {
+                "query": "SOURCE '/aws/lambda/om-data-${sls:stage}-sinkOnemac' | fields @timestamp, @message\n| sort @timestamp desc\n| limit 50",
+                "region": "${env:REGION_A}",
+                "stacked": false,
+                "title": "Logs",
+                "view": "table"
+            }
+        },
+        {
+            "height": 3,
+            "width": 5,
+            "y": 10,
+            "x": 0,
+            "type": "alarm",
+            "properties": {
+                "title": "Alarms",
+                "alarms": [
+                    "arn:aws:cloudwatch:${env:REGION_A}:${aws:accountId}:alarm:om-data-${sls:stage}-sinkOnemacErrorCount",
+                    "arn:aws:cloudwatch:${env:REGION_A}:${aws:accountId}:alarm:om-data-${sls:stage}-ONEMAC-validation-error"
+                ]
+            }
+        },
+        {
+            "height": 4,
+            "width": 5,
+            "y": 5,
+            "x": 0,
+            "type": "metric",
+            "properties": {
+                "metrics": [
+                    [
+                        "AWS/Lambda",
+                        "OffsetLag",
+                        "FunctionName",
+                        "om-data-${sls:stage}-sinkSeatool",
+                        {
+                            "region": "${env:REGION_A}"
+                        }
+                    ]
+                ],
+                "sparkline": true,
+                "view": "singleValue",
+                "region": "${env:REGION_A}",
+                "period": 60,
+                "stat": "Maximum"
+            }
+        },
+        {
+            "height": 4,
+            "width": 5,
+            "y": 13,
+            "x": 0,
+            "type": "metric",
+            "properties": {
+                "metrics": [
+                    [
+                        "AWS/Lambda",
+                        "OffsetLag",
+                        "FunctionName",
+                        "om-data-${sls:stage}-sinkOnemac"
+                    ]
+                ],
+                "sparkline": true,
+                "view": "singleValue",
+                "region": "${env:REGION_A}",
+                "period": 60,
+                "stat": "Maximum"
+            }
+        },
+        {
+            "height": 1,
+            "width": 24,
+            "y": 1,
+            "x": 0,
+            "type": "text",
+            "properties": {
+                "markdown": "## seatool sink",
+                "background": "transparent"
+            }
+        },
+        {
+            "height": 1,
+            "width": 24,
+            "y": 9,
+            "x": 0,
+            "type": "text",
+            "properties": {
+                "markdown": "## onemac sink",
+                "background": "transparent"
+            }
+        },
+        {
+            "height": 1,
+            "width": 24,
+            "y": 17,
+            "x": 0,
+            "type": "text",
+            "properties": {
+                "markdown": "# api",
+                "background": "transparent"
+            }
+        },
+        {
+            "height": 7,
+            "width": 6,
+            "y": 37,
+            "x": 0,
+            "type": "metric",
+            "properties": {
+                "metrics": [
+                    [
+                        "AWS/Lambda",
+                        "Invocations",
+                        "FunctionName",
+                        "om-api-${sls:stage}-search",
+                        {
+                            "region": "${env:REGION_A}"
+                        }
+                    ],
+                    [
+                        ".",
+                        "Throttles",
+                        ".",
+                        ".",
+                        {
+                            "region": "${env:REGION_A}"
+                        }
+                    ],
+                    [
+                        ".",
+                        "Errors",
+                        ".",
+                        ".",
+                        {
+                            "region": "${env:REGION_A}",
+                            "color": "#d62728"
+                        }
+                    ]
+                ],
+                "view": "timeSeries",
+                "stacked": false,
+                "region": "${env:REGION_A}",
+                "title": "Lambda",
+                "period": 60,
+                "stat": "Sum"
+            }
+        },
+        {
+            "height": 7,
+            "width": 18,
+            "y": 37,
+            "x": 6,
+            "type": "log",
+            "properties": {
+                "query": "SOURCE '/aws/lambda/om-api-${sls:stage}-search' | fields @timestamp, @message\n| sort @timestamp desc\n| limit 50",
+                "region": "${env:REGION_A}",
+                "stacked": false,
+                "title": "Logs",
+                "view": "table"
+            }
+        },
+        {
+            "height": 1,
+            "width": 24,
+            "y": 36,
+            "x": 0,
+            "type": "text",
+            "properties": {
+                "markdown": "## search",
+                "background": "transparent"
+            }
+        },
+        {
+            "height": 1,
+            "width": 24,
+            "y": 44,
+            "x": 0,
+            "type": "text",
+            "properties": {
+                "markdown": "## item",
+                "background": "transparent"
+            }
+        },
+        {
+            "height": 7,
+            "width": 6,
+            "y": 45,
+            "x": 0,
+            "type": "metric",
+            "properties": {
+                "metrics": [
+                    [
+                        "AWS/Lambda",
+                        "Invocations",
+                        "FunctionName",
+                        "om-api-${sls:stage}-item"
+                    ],
+                    [
+                        ".",
+                        "Throttles",
+                        ".",
+                        "."
+                    ],
+                    [
+                        ".",
+                        "Errors",
+                        ".",
+                        ".",
+                        {
+                            "color": "#d62728"
+                        }
+                    ]
+                ],
+                "view": "timeSeries",
+                "stacked": false,
+                "region": "${env:REGION_A}",
+                "title": "Lambda",
+                "period": 60,
+                "stat": "Sum"
+            }
+        },
+        {
+            "height": 7,
+            "width": 18,
+            "y": 45,
+            "x": 6,
+            "type": "log",
+            "properties": {
+                "query": "SOURCE '/aws/lambda/om-data-${sls:stage}-bootstrapKibanaUsers' | SOURCE '/aws/lambda/om-api-${sls:stage}-item' | fields @timestamp, @message\n| sort @timestamp desc\n| limit 50",
+                "region": "${env:REGION_A}",
+                "stacked": false,
+                "title": "Logs",
+                "view": "table"
+            }
+        },
+        {
+            "height": 1,
+            "width": 24,
+            "y": 52,
+            "x": 0,
+            "type": "text",
+            "properties": {
+                "markdown": "## getAttachmentUrl",
+                "background": "transparent"
+            }
+        },
+        {
+            "height": 7,
+            "width": 6,
+            "y": 53,
+            "x": 0,
+            "type": "metric",
+            "properties": {
+                "metrics": [
+                    [
+                        "AWS/Lambda",
+                        "Invocations",
+                        "FunctionName",
+                        "om-api-${sls:stage}-getAttachmentUrl"
+                    ],
+                    [
+                        ".",
+                        "Throttles",
+                        ".",
+                        "."
+                    ],
+                    [
+                        ".",
+                        "Errors",
+                        ".",
+                        ".",
+                        {
+                            "color": "#d62728"
+                        }
+                    ]
+                ],
+                "view": "timeSeries",
+                "stacked": false,
+                "region": "${env:REGION_A}",
+                "title": "Lambda",
+                "period": 60,
+                "stat": "Sum"
+            }
+        },
+        {
+            "height": 7,
+            "width": 18,
+            "y": 53,
+            "x": 6,
+            "type": "log",
+            "properties": {
+                "query": "SOURCE '/aws/lambda/om-api-${sls:stage}-getAttachmentUrl' | fields @timestamp, @message\n| sort @timestamp desc\n| limit 50",
+                "region": "${env:REGION_A}",
+                "stacked": false,
+                "title": "Logs",
+                "view": "table"
+            }
         }
     ]
 }
\ No newline at end of file