diff --git a/charts/flyte-core/README.md b/charts/flyte-core/README.md
index df4590f56c..c633f19959 100644
--- a/charts/flyte-core/README.md
+++ b/charts/flyte-core/README.md
@@ -255,6 +255,7 @@ helm install gateway bitnami/contour -n flyte
 | flytepropeller.image.repository | string | `"cr.flyte.org/flyteorg/flytepropeller"` | Docker image for Flytepropeller deployment |
 | flytepropeller.image.tag | string | `"v1.13.2"` |  |
 | flytepropeller.manager | bool | `false` |  |
+| flytepropeller.manager_resources | object | `{"resources":{"limits":{"cpu":"200m","ephemeral-storage":"100Mi","memory":"200Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"100Mi"}}}` | If manager is set to true this can be used to give the flytepropeller-manager different resource requests than the sharded flyte propeller pods |
 | flytepropeller.nodeSelector | object | `{}` | nodeSelector for Flytepropeller deployment |
 | flytepropeller.podAnnotations | object | `{}` | Annotations for Flytepropeller pods |
 | flytepropeller.podEnv | object | `{}` | Additional Flytepropeller container environment variables |
diff --git a/charts/flyte-core/templates/propeller/deployment.yaml b/charts/flyte-core/templates/propeller/deployment.yaml
index 4308f2d6fa..c72db0e7b3 100644
--- a/charts/flyte-core/templates/propeller/deployment.yaml
+++ b/charts/flyte-core/templates/propeller/deployment.yaml
@@ -83,7 +83,11 @@ spec:
         {{- end }}
         ports:
         - containerPort: {{ index .Values.configmap.core.propeller "prof-port" }}
+        {{- if and (.Values.flytepropeller.manager) (.Values.flytepropeller.manager_resources) }}
+        resources: {{- toYaml .Values.flytepropeller.manager_resources.resources | nindent 10 }}
+        {{- else }}
         resources: {{- toYaml .Values.flytepropeller.resources | nindent 10 }}
+        {{- end }}
         volumeMounts:
         - name: config-volume
           mountPath: /etc/flyte/config
diff --git a/charts/flyte-core/values.yaml b/charts/flyte-core/values.yaml
index 09e20f2a23..549e0da249 100755
--- a/charts/flyte-core/values.yaml
+++ b/charts/flyte-core/values.yaml
@@ -323,6 +323,17 @@ flytepropeller:
       cpu: 10m
       ephemeral-storage: 50Mi
       memory: 100Mi
+  # -- If manager is set to true this can be used to give the flytepropeller-manager different resource requests than the sharded flyte propeller pods
+  manager_resources:
+    resources:
+      limits:
+        cpu: 200m
+        ephemeral-storage: 100Mi
+        memory: 200Mi
+      requests:
+        cpu: 10m
+        ephemeral-storage: 50Mi
+        memory: 100Mi
   # -- Error reporting
   terminationMessagePolicy: FallbackToLogsOnError
   # -- Default regex string for searching configuration files
diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml
index ed5dd5ea70..480592de00 100644
--- a/docker/sandbox-bundled/manifests/complete-agent.yaml
+++ b/docker/sandbox-bundled/manifests/complete-agent.yaml
@@ -821,7 +821,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: ZncyUmNBaWdYWlJmTUVMVA==
+  haSharedSecret: enNEdDR0dExVcnl4SzFwcQ==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1418,7 +1418,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: f2f7afffa66c57f22b3c423e1ec672e533bededf3848df42ae23e805da175146
+        checksum/secret: 85a71396ad8f3f7ac79cbc64439d42dd176edf59a41568fd1157f52343a2da42
       labels:
         app: docker-registry
         release: flyte-sandbox
diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml
index 6c6cb37a62..7a911cf873 100644
--- a/docker/sandbox-bundled/manifests/complete.yaml
+++ b/docker/sandbox-bundled/manifests/complete.yaml
@@ -803,7 +803,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: VWxGQXNKU1RyMk5haUpZWA==
+  haSharedSecret: b3pESlBJbFBGdjBHQjUzTQ==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1367,7 +1367,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: 421896ac3426efc3fb1d427ce98c9c6d631de7dcc4599a53726fb37eb59e6aad
+        checksum/secret: beed8c901d51f3266dcdb7285b489264504d92a294a89b70320a4160fbbe3692
       labels:
         app: docker-registry
         release: flyte-sandbox
diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml
index a717b996a4..1b3903b752 100644
--- a/docker/sandbox-bundled/manifests/dev.yaml
+++ b/docker/sandbox-bundled/manifests/dev.yaml
@@ -499,7 +499,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  haSharedSecret: QXRvTWlFM1NYcE5NRWlidg==
+  haSharedSecret: STVTaU13c1FuYWJMSHlXRw==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -934,7 +934,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: ba6d3d6226ec4daefb7d441c51c19ea2363808c06739832a58c342a92df951e8
+        checksum/secret: e742ce61227d4ebab3fc34efeea1c67bd9386a4d83b94c4e8c00c95ab9b592c8
       labels:
         app: docker-registry
         release: flyte-sandbox