diff --git a/online-boutique/kustomize/dashboard.yaml b/online-boutique/kustomize/dashboard.yaml
index b45f30f..c487d66 100644
--- a/online-boutique/kustomize/dashboard.yaml
+++ b/online-boutique/kustomize/dashboard.yaml
@@ -103,7 +103,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "argocd_app_info{dest_namespace=~\"$namespace\", health_status=\"Healthy\"}",
+              "expr": "argocd_app_info{dest_namespace=~\"$namespace\", health_status=\"Healthy\"} or on() vector(0)",
               "format": "table",
               "instant": true,
               "intervalFactor": 1,
diff --git a/online-boutique/kustomize/kustomization.yaml b/online-boutique/kustomize/kustomization.yaml
index d740212..b2e8dd9 100644
--- a/online-boutique/kustomize/kustomization.yaml
+++ b/online-boutique/kustomize/kustomization.yaml
@@ -13,8 +13,9 @@ resources:
 components:
 - https://github.com/GoogleCloudPlatform/microservices-demo//kustomize/components/network-policies?timeout=90s&ref=6af73dcf7fe1ca653d95ae7a29e12faf8cf02964
 - https://github.com/GoogleCloudPlatform/microservices-demo//kustomize/components/non-public-frontend?timeout=90s&ref=6af73dcf7fe1ca653d95ae7a29e12faf8cf02964
-- https://github.com/GoogleCloudPlatform/microservices-demo//kustomize/components/without-loadgenerator?timeout=90s&ref=6af73dcf7fe1ca653d95ae7a29e12faf8cf02964
 - https://github.com/GoogleCloudPlatform/microservices-demo//kustomize/components/cymbal-branding?timeout=90s&ref=6af73dcf7fe1ca653d95ae7a29e12faf8cf02964
 patches:
 - path: patch-enable-tracing.yaml
 - path: patch-frontend-admin-panel.yaml
+- path: patch-loadgenerator-config.yaml
+- path: patch-currency-service-limits.yaml
diff --git a/online-boutique/kustomize/patch-currency-service-limits.yaml b/online-boutique/kustomize/patch-currency-service-limits.yaml
new file mode 100644
index 0000000..5a9850c
--- /dev/null
+++ b/online-boutique/kustomize/patch-currency-service-limits.yaml
@@ -0,0 +1,12 @@
+# See https://github.com/GoogleCloudPlatform/microservices-demo/issues/2400
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: currencyservice
+spec:
+  template:
+    spec:
+      containers:
+      - name: server
+        resources:
+          limits: null
diff --git a/online-boutique/kustomize/patch-loadgenerator-config.yaml b/online-boutique/kustomize/patch-loadgenerator-config.yaml
new file mode 100644
index 0000000..77efbb8
--- /dev/null
+++ b/online-boutique/kustomize/patch-loadgenerator-config.yaml
@@ -0,0 +1,20 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: loadgenerator
+spec:
+  template:
+    spec:
+      containers:
+      - name: main
+        # TODO: Use upstream image when https://github.com/GoogleCloudPlatform/microservices-demo/pull/2775 is released
+        image: ghcr.io/aslafy-z/microservices-demo/loadgenerator:pr-2775
+        imagePullPolicy: Always
+        env:
+        - name: FRONTEND_ADDR
+          value: shop.ref+file://config.yaml#/ingress/domainName+:443
+        - name: FRONTEND_PROTO
+          value: https
+        - name: USERS
+          value: "240"