diff --git a/deployment/sandbox/flyte_generated.yaml b/deployment/sandbox/flyte_generated.yaml
index d0e114b322..539af35081 100644
--- a/deployment/sandbox/flyte_generated.yaml
+++ b/deployment/sandbox/flyte_generated.yaml
@@ -9724,9 +9724,11 @@ data:
         batching-interval: 2s
         batch-size: -1
         queue:
-          type: bucket
-          rate: 10
-          capacity: 100
+          type: maxof
+          rate: 100
+          capacity: 1000
+          base-delay: 5s
+          max-delay: 120s
         sub-queue:
           type: bucket
           rate: 10
@@ -9807,7 +9809,7 @@ data:
         kubernetes-url: "http://localhost:30082"
 kind: ConfigMap
 metadata:
-  name: flyte-propeller-config-t88d5b727h
+  name: flyte-propeller-config-4478hcfh2c
   namespace: flyte
 ---
 apiVersion: v1
@@ -10409,7 +10411,7 @@ spec:
       serviceAccountName: flytepropeller
       volumes:
       - configMap:
-          name: flyte-propeller-config-t88d5b727h
+          name: flyte-propeller-config-4478hcfh2c
         name: config-volume
 ---
 apiVersion: apps/v1
diff --git a/deployment/test/flyte_generated.yaml b/deployment/test/flyte_generated.yaml
index 49f68057a9..32fe3f6397 100644
--- a/deployment/test/flyte_generated.yaml
+++ b/deployment/test/flyte_generated.yaml
@@ -570,9 +570,11 @@ data:
         batching-interval: 2s
         batch-size: -1
         queue:
-          type: bucket
-          rate: 10
-          capacity: 100
+          type: maxof
+          rate: 100
+          capacity: 1000
+          base-delay: 5s
+          max-delay: 120s
         sub-queue:
           type: bucket
           rate: 10
@@ -627,7 +629,7 @@ data:
         kubernetes-url: "http://localhost:30082"
 kind: ConfigMap
 metadata:
-  name: flyte-propeller-config-c55k94mm2h
+  name: flyte-propeller-config-45fc6m5292
   namespace: flyte
 ---
 apiVersion: v1
@@ -1061,7 +1063,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: ghcr.io/lyft/flytepropeller:v0.5.13
+        image: ghcr.io/flyteorg/flytepropeller:v0.5.13
         imagePullPolicy: IfNotPresent
         name: flytepropeller
         ports:
@@ -1072,7 +1074,7 @@ spec:
       serviceAccountName: flytepropeller
       volumes:
       - configMap:
-          name: flyte-propeller-config-c55k94mm2h
+          name: flyte-propeller-config-45fc6m5292
         name: config-volume
 ---
 apiVersion: apps/v1
diff --git a/end2end/tests/endtoend.yaml b/end2end/tests/endtoend.yaml
index 46a20f2d51..82aa687985 100644
--- a/end2end/tests/endtoend.yaml
+++ b/end2end/tests/endtoend.yaml
@@ -11,7 +11,7 @@ spec:
     command:
     - bash
     - -c
-    image: ghcr.io/nuclyde-io/flytetools:e37ed7bdd44901a4e4c533b31f915355ab74dcf3 
+    image: ghcr.io/flyteorg/flytetools:85ab24ff1025327a02cbd570ab96bbdded132ce9
     imagePullPolicy: IfNotPresent
     name: flytetester
     resources:
diff --git a/kustomize/base/single_cluster/headless/config/propeller/core.yaml b/kustomize/base/single_cluster/headless/config/propeller/core.yaml
index f316fca7e3..e1fce27b72 100644
--- a/kustomize/base/single_cluster/headless/config/propeller/core.yaml
+++ b/kustomize/base/single_cluster/headless/config/propeller/core.yaml
@@ -22,9 +22,11 @@ propeller:
     batching-interval: 2s
     batch-size: -1
     queue:
-      type: bucket
-      rate: 10
-      capacity: 100
+      type: maxof
+      rate: 100
+      capacity: 1000
+      base-delay: 5s
+      max-delay: 120s
     sub-queue:
       type: bucket
       rate: 10
diff --git a/kustomize/overlays/test/kustomization.yaml b/kustomize/overlays/test/kustomization.yaml
index da05f7238b..b312d26deb 100644
--- a/kustomize/overlays/test/kustomization.yaml
+++ b/kustomize/overlays/test/kustomization.yaml
@@ -76,4 +76,4 @@ images:
   # FlytePropeller
   - name: flytepropeller # match images with this name
     newTag: v0.5.13 # override the tag
-    newName: ghcr.io/lyft/flytepropeller # override the name
+    newName: ghcr.io/flyteorg/flytepropeller # override the name