diff --git a/infrastructure/charts/mev-commit-dashboard/values.yaml b/infrastructure/charts/mev-commit-dashboard/values.yaml
index cfc9d7192..6716e4614 100644
--- a/infrastructure/charts/mev-commit-dashboard/values.yaml
+++ b/infrastructure/charts/mev-commit-dashboard/values.yaml
@@ -40,10 +40,10 @@ service:
 resources:
   requests:
     cpu: "100m"
-    memory: "128Mi"
+    memory: "50Mi"
   limits:
     cpu: "500m"
-    memory: "512Mi"
+    memory: "100Mi"
 
 # Configuration for the Dashboard
 config:
diff --git a/infrastructure/charts/mev-commit-emulator-bt/values.yaml b/infrastructure/charts/mev-commit-emulator-bt/values.yaml
index 0fe483d5f..5e320a48e 100644
--- a/infrastructure/charts/mev-commit-emulator-bt/values.yaml
+++ b/infrastructure/charts/mev-commit-emulator-bt/values.yaml
@@ -37,8 +37,8 @@ resources:
     cpu: 1000m
     memory: 1Gi
   requests:
-    cpu: 500m
-    memory: 512Mi
+    cpu: 50m
+    memory: 100Mi
 
 # Bidder Emulator specific configuration
 bidderEmulator:
diff --git a/infrastructure/charts/mev-commit-erigon/values.yaml b/infrastructure/charts/mev-commit-erigon/values.yaml
index 650e6860d..9c112d96e 100644
--- a/infrastructure/charts/mev-commit-erigon/values.yaml
+++ b/infrastructure/charts/mev-commit-erigon/values.yaml
@@ -85,15 +85,15 @@ terminationGracePeriodSeconds: 60
 resources:
   erigon:
     requests:
-      cpu: "1000m"
-      memory: "2Gi"
+      cpu: "100m"
+      memory: "500Mi"
     limits:
       cpu: "6000m"
       memory: "16Gi"
   snode:
     requests:
       cpu: "100m"
-      memory: "1Gi"
+      memory: "100Mi"
     limits:
       cpu: "6000m"
       memory: "16Gi"
@@ -101,12 +101,13 @@ resources:
 # Init container resources
 initContainerResources:
   requests:
-    cpu: "500m"
-    memory: "500Mi"
+    cpu: "50m"
+    memory: "100Mi"
   limits:
     cpu: "1000m"
     memory: "1Gi"
 
+
 service:
   erigon:
     type: LoadBalancer
diff --git a/infrastructure/charts/mev-commit-geth-l1/values.yaml b/infrastructure/charts/mev-commit-geth-l1/values.yaml
index 85beefa65..1bcf1afd9 100644
--- a/infrastructure/charts/mev-commit-geth-l1/values.yaml
+++ b/infrastructure/charts/mev-commit-geth-l1/values.yaml
@@ -94,8 +94,8 @@ resources:
     cpu: 2000m
     memory: 4Gi
   requests:
-    cpu: 500m
-    memory: 1Gi
+    cpu: 50m
+    memory: 100Mi
 
 # Node selector and tolerations
 #nodeSelector:
diff --git a/infrastructure/charts/postgres/values.yaml b/infrastructure/charts/postgres/values.yaml
index 593b61c46..19750a0aa 100644
--- a/infrastructure/charts/postgres/values.yaml
+++ b/infrastructure/charts/postgres/values.yaml
@@ -47,7 +47,7 @@ resources:
     memory: 4Gi
   requests:
     cpu: 100m
-    memory: 1Gi
+    memory: 10Mi
 
 # Security context
 securityContext:
diff --git a/infrastructure/docker/docker-bake.hcl b/infrastructure/docker/docker-bake.hcl
index 7c11b322a..01bb1c1d7 100644
--- a/infrastructure/docker/docker-bake.hcl
+++ b/infrastructure/docker/docker-bake.hcl
@@ -1,7 +1,18 @@
-variable "TAG" { default = "dev" }
-variable "PLATFORM" { default = ["linux/amd64"] }
-variable "REGISTRY" { default = "ghcr.io/primev" }
-variable "REPO_NAME" { default = "" }
+variable "TAG" {
+  default = "dev"
+}
+
+variable "PLATFORM" {
+  default = "linux/amd64"
+}
+
+variable "REGISTRY" {
+  default = "ghcr.io/primev"
+}
+
+variable "REPO_NAME" {
+  default = ""
+}
 
 # Git variables - these will be passed from Makefile
 variable "GIT_BRANCH" { 
@@ -15,11 +26,11 @@ variable "GIT_COMMIT" {
 function "get_labels" {
   params = [component]
   result = {
-    "branch" = GIT_BRANCH != null ? GIT_BRANCH : "unknown"
-    "commit" = GIT_COMMIT != null ? GIT_COMMIT : "unknown"
-    "component" = component
-    "build.timestamp" = timestamp()
-    "build.tag" = TAG
+    "branch"         = GIT_BRANCH != null ? GIT_BRANCH : "unknown"
+    "commit"         = GIT_COMMIT != null ? GIT_COMMIT : "unknown"
+    "component"      = component
+    "build.timestamp"= timestamp()
+    "build.tag"      = TAG
   }
 }
 
@@ -27,99 +38,109 @@ target "mev-commit-builder" {
   inherits   = ["_common"]
   context    = "../../"
   dockerfile = "infrastructure/docker/Dockerfile.builder"
-  labels = get_labels("builder")
+  labels     = get_labels("builder")
 }
 
 target "mev-commit-oracle" {
-  inherits = ["_common"]
+  inherits   = ["_common"]
   context    = "./"
   dockerfile = "Dockerfile.oracle"
   contexts = {
     builder_ctx = "target:mev-commit-builder"
   }
-  tags = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-mev-commit-oracle" : "${REGISTRY}/mev-commit-oracle:${TAG}"]
+  tags   = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-mev-commit-oracle" : "${REGISTRY}/mev-commit-oracle:${TAG}"]
   labels = get_labels("oracle")
 }
 
 target "mev-commit" {
-  inherits = ["_common"]
+  inherits   = ["_common"]
   context    = "./"
   dockerfile = "Dockerfile.p2p"
   contexts = {
     builder_ctx = "target:mev-commit-builder"
   }
-  tags = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-mev-commit" : "${REGISTRY}/mev-commit:${TAG}"]
+  tags   = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-mev-commit" : "${REGISTRY}/mev-commit:${TAG}"]
   labels = get_labels("p2p")
 }
 
 target "mev-commit-bridge" {
-  inherits = ["_common"]
+  inherits   = ["_common"]
   context    = "./"
   dockerfile = "Dockerfile.bridge"
   contexts = {
     builder_ctx = "target:mev-commit-builder"
   }
-  tags = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-mev-commit-bridge" : "${REGISTRY}/mev-commit-bridge:${TAG}"]
+  tags   = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-mev-commit-bridge" : "${REGISTRY}/mev-commit-bridge:${TAG}"]
   labels = get_labels("bridge")
 }
 
 target "mev-commit-dashboard" {
-  inherits = ["_common"]
+  inherits   = ["_common"]
   context    = "./"
   dockerfile = "Dockerfile.dashboard"
   contexts = {
     builder_ctx = "target:mev-commit-builder"
   }
-  tags = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-mev-commit-dashboard" : "${REGISTRY}/mev-commit-dashboard:${TAG}"]
+  tags   = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-mev-commit-dashboard" : "${REGISTRY}/mev-commit-dashboard:${TAG}"]
   labels = get_labels("dashboard")
 }
 
 target "preconf-rpc" {
-  inherits = ["_common"]
+  inherits   = ["_common"]
   context    = "./"
   dockerfile = "Dockerfile.rpc"
   contexts = {
     builder_ctx = "target:mev-commit-builder"
   }
-  tags = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-preconf-rpc" : "${REGISTRY}/preconf-rpc:${TAG}"]
+  tags   = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-preconf-rpc" : "${REGISTRY}/preconf-rpc:${TAG}"]
   labels = get_labels("preconf-rpc")
 }
 
 target "bidder-emulator" {
-  inherits = ["_common"]
+  inherits   = ["_common"]
   context    = "./"
   dockerfile = "Dockerfile.bidderemulator"
   contexts = {
     builder_ctx = "target:mev-commit-builder"
   }
-  tags = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-bidder-emulator" : "${REGISTRY}/bidder-emulator:${TAG}"]
+  tags   = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-bidder-emulator" : "${REGISTRY}/bidder-emulator:${TAG}"]
   labels = get_labels("bidder-emulator")
 }
 
 target "provider-emulator" {
-  inherits = ["_common"]
+  inherits   = ["_common"]
   context    = "./"
   dockerfile = "Dockerfile.provideremulator"
   contexts = {
     builder_ctx = "target:mev-commit-builder"
   }
-  tags = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-provider-emulator" : "${REGISTRY}/provider-emulator:${TAG}"]
+  tags   = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-provider-emulator" : "${REGISTRY}/provider-emulator:${TAG}"]
   labels = get_labels("provider-emulator")
 }
 
 target "relay-emulator" {
-  inherits = ["_common"]
+  inherits   = ["_common"]
   context    = "./"
   dockerfile = "Dockerfile.relayemulator"
   contexts = {
     builder_ctx = "target:mev-commit-builder"
   }
-  tags = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-relay-emulator" : "${REGISTRY}/relay-emulator:${TAG}"]
+  tags   = [REPO_NAME != "" ? "${REGISTRY}/${REPO_NAME}:${TAG}-relay-emulator" : "${REGISTRY}/relay-emulator:${TAG}"]
   labels = get_labels("relay-emulator")
 }
 
 group "all" {
-  targets = ["mev-commit-builder", "mev-commit-oracle", "mev-commit", "mev-commit-bridge", "mev-commit-dashboard", "preconf-rpc", "bidder-emulator", "provider-emulator", "relay-emulator"]
+  targets = [
+    "mev-commit-builder",
+    "mev-commit-oracle",
+    "mev-commit",
+    "mev-commit-bridge",
+    "mev-commit-dashboard",
+    "preconf-rpc",
+    "bidder-emulator",
+    "provider-emulator",
+    "relay-emulator"
+  ]
 }
 
 group "default" {
@@ -127,6 +148,7 @@ group "default" {
 }
 
 target "_common" {
-  platforms = PLATFORM
-  output = ["type=docker"]
+  platforms = [PLATFORM]
+  output    = ["type=docker"]
 }
+