diff --git a/infrastructure/main.tf b/infrastructure/main.tf
index a466d713d83..aaee4ed66da 100644
--- a/infrastructure/main.tf
+++ b/infrastructure/main.tf
@@ -73,7 +73,7 @@ module "postgresql_v15" {
   providers = {
     azurerm.postgres_network = azurerm.postgres_network
   }
-  
+
   admin_user_object_id = var.jenkins_AAD_objectId
   business_area        = "cft"
   common_tags          = var.common_tags
@@ -100,6 +100,18 @@ module "postgresql_v15" {
     {
       name  = "logfiles.retention_days"
       value = "7"
+    },
+    {
+      name = "pg_qs.query_capture_mode"
+      value = "ALL"
+    },
+    {
+      name  = "log_lock_waits"
+      value = "on"
+    },
+    {
+      name  = "pgms_wait_sampling.query_capture_mode"
+      value = "ALL"
     }
   ]
   pgsql_version    = "15"
@@ -143,3 +155,10 @@ resource "azurerm_key_vault_secret" "POSTGRES_DATABASE" {
   value        = var.database_name
   key_vault_id = data.azurerm_key_vault.ccd_shared_key_vault.id
 }
+resource "azurerm_log_analytics_workspace" "LOG_ANALYTICS_WORKSPACE" {
+  name                = "ccd-log-analytics"
+  resource_group_name = "${local.sharedResourceGroup}"
+  location            = "${var.location}"
+  sku                 = "PerGB2018"
+  retention_in_days   = 30
+}