diff --git a/deployer-image/Makefile b/deployer-image/Makefile
index 81edb47..f410c2e 100644
--- a/deployer-image/Makefile
+++ b/deployer-image/Makefile
@@ -58,6 +58,11 @@ verify: build
 	@echo "Verifying application with deployer: $(DEPLOYER_IMAGE_RELEASE)"
 	$(MPDEV) verify --deployer=$(DEPLOYER_IMAGE_RELEASE)
 
+tofu: tofu/fmt
+
+tofu/fmt:
+	tofu fmt --recursive .
+
 validate:
 	@echo "Validating schema file: $(SCHEMA_FILE)"
 	$(MPDEV) validate --schema=$(SCHEMA_FILE)
diff --git a/deployer-image/terraform/main.tf b/deployer-image/terraform/main.tf
index 602b1a8..803b0da 100644
--- a/deployer-image/terraform/main.tf
+++ b/deployer-image/terraform/main.tf
@@ -19,14 +19,14 @@ provider "kubernetes" {
   token                  = file("/var/run/secrets/kubernetes.io/serviceaccount/token")
   cluster_ca_certificate = file("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt")
   # If the cluster CA is signed by a recognized authority, you can set 'insecure = false'
-  insecure               = false
+  insecure = false
 }
 
 module "stackgen" {
-  source                            = "./modules/stackgen-installation"
-  domain                            = var.domain
-  STACKGEN_PAT                      = var.STACKGEN_PAT
-  suffix                            = var.suffix
+  source                = "./modules/stackgen-installation"
+  domain                = var.domain
+  STACKGEN_PAT          = var.STACKGEN_PAT
+  suffix                = var.suffix
   global_static_ip_name = var.global_static_ip_name
-  pre_shared_cert_name = var.pre_shared_cert_name
+  pre_shared_cert_name  = var.pre_shared_cert_name
 }
diff --git a/deployer-image/terraform/modules/stackgen-installation/database.tf b/deployer-image/terraform/modules/stackgen-installation/database.tf
index e372d09..3d6c482 100644
--- a/deployer-image/terraform/modules/stackgen-installation/database.tf
+++ b/deployer-image/terraform/modules/stackgen-installation/database.tf
@@ -62,10 +62,13 @@ locals {
 ##############################################################################
 
 resource "helm_release" "postgresql" {
-  name       = "my-postgresql"
-  namespace  = "stackgen"
-  chart      = "postgresql-16.4.3.tgz" # Path to your local chart file
+  name = "postgres"
 
+  repository = "oci://registry-1.docker.io/"
+  chart      = "bitnamicharts/postgresql"
+  version    = "16.4.5"
+
+  namespace = var.namespace
   values = [
     yamlencode(local.postgresql_values) # Convert the object to a YAML string
   ]
diff --git a/deployer-image/terraform/modules/stackgen-installation/main.tf b/deployer-image/terraform/modules/stackgen-installation/main.tf
index 917264f..5d0e3a4 100644
--- a/deployer-image/terraform/modules/stackgen-installation/main.tf
+++ b/deployer-image/terraform/modules/stackgen-installation/main.tf
@@ -25,7 +25,7 @@ resource "kubernetes_service_account" "stackgen_identity" {
 
 
 resource "kubernetes_config_map" "dex_configmap" {
-  depends_on = [ kubernetes_namespace.this ]
+  depends_on = [kubernetes_namespace.this]
   metadata {
     name      = "dex-configmap"
     namespace = var.namespace
@@ -221,7 +221,7 @@ locals {
     enable_feature : var.enable_feature
     appcd_admin_emails : var.admin_emails
     enable_storage : length(var.storage.volume) > 0
-    appcd_service_account: local.appcd_service_account
+    appcd_service_account : local.appcd_service_account
   })
 }
 
diff --git a/deployer-image/terraform/modules/stackgen-installation/proxy.tf b/deployer-image/terraform/modules/stackgen-installation/proxy.tf
index 3ff6e9a..a2b0496 100644
--- a/deployer-image/terraform/modules/stackgen-installation/proxy.tf
+++ b/deployer-image/terraform/modules/stackgen-installation/proxy.tf
@@ -7,7 +7,7 @@ resource "kubernetes_config_map" "proxy_config" {
 
   data = {
     "nginx.conf" = join("\n", compact([
-      templatefile("./values/proxy-base.conf.tpl", { 
+      templatefile("./values/proxy-base.conf.tpl", {
         domain    = var.domain,
         namespace = var.namespace
       }),
@@ -60,7 +60,7 @@ resource "kubernetes_deployment" "nginx_server" {
               port = 80
             }
             initial_delay_seconds = 5
-            period_seconds         = 10
+            period_seconds        = 10
           }
 
           liveness_probe {
@@ -69,7 +69,7 @@ resource "kubernetes_deployment" "nginx_server" {
               port = 80
             }
             initial_delay_seconds = 10
-            period_seconds         = 15
+            period_seconds        = 15
           }
         }
 
@@ -88,9 +88,9 @@ resource "kubernetes_deployment" "nginx_server" {
 
 # Kubernetes Service
 resource "kubernetes_service" "nginx_service" {
-  depends_on = [ kubernetes_deployment.nginx_server ]
+  depends_on = [kubernetes_deployment.nginx_server]
   metadata {
-    name = "proxy"
+    name      = "proxy"
     namespace = var.namespace
   }
 
@@ -116,7 +116,7 @@ resource "kubernetes_ingress_v1" "nginx_server_ingress" {
     namespace = var.namespace
 
     annotations = {
-      "kubernetes.io/ingress.class"                = "gce"
+      "kubernetes.io/ingress.class"                 = "gce"
       "kubernetes.io/ingress.global-static-ip-name" = var.global_static_ip_name
       "ingress.gcp.kubernetes.io/pre-shared-cert"   = var.pre_shared_cert_name
     }
@@ -128,7 +128,7 @@ resource "kubernetes_ingress_v1" "nginx_server_ingress" {
 
       http {
         path {
-          path     = "/"
+          path      = "/"
           path_type = "Prefix"
 
           backend {
diff --git a/deployer-image/terraform/modules/stackgen-installation/variables.tf b/deployer-image/terraform/modules/stackgen-installation/variables.tf
index 735b19a..c057a18 100644
--- a/deployer-image/terraform/modules/stackgen-installation/variables.tf
+++ b/deployer-image/terraform/modules/stackgen-installation/variables.tf
@@ -116,8 +116,8 @@ variable "storage" {
   }
 }
 variable "global_static_ip_name" {
-  type        = string  
+  type = string
 }
 variable "pre_shared_cert_name" {
-  type        = string
+  type = string
 }
diff --git a/deployer-image/terraform/postgresql-16.4.3.tgz b/deployer-image/terraform/postgresql-16.4.3.tgz
deleted file mode 100644
index 429f7ed..0000000
Binary files a/deployer-image/terraform/postgresql-16.4.3.tgz and /dev/null differ
diff --git a/deployer-image/terraform/variables.tf b/deployer-image/terraform/variables.tf
index 875725d..08dffb6 100644
--- a/deployer-image/terraform/variables.tf
+++ b/deployer-image/terraform/variables.tf
@@ -1,7 +1,7 @@
 variable "suffix" {
   type        = string
   description = "Suffix to all names"
-  default = "marketplace"
+  default     = "marketplace"
 }
 
 variable "domain" {
@@ -22,8 +22,8 @@ variable "labels" {
 }
 
 variable "global_static_ip_name" {
-  type        = string  
+  type = string
 }
 variable "pre_shared_cert_name" {
-  type        = string
+  type = string
 }