diff --git a/deploy/kubernetes/charts/assets/values.yaml b/deploy/kubernetes/charts/assets/values.yaml
index a13fd8a87..8f5bccf3c 100644
--- a/deploy/kubernetes/charts/assets/values.yaml
+++ b/deploy/kubernetes/charts/assets/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: public.ecr.aws/aws-containers/retail-store-sample-assets
   pullPolicy: IfNotPresent
-  tag: 0.5.0
+  tag: 0.6.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/kubernetes/charts/carts/values.yaml b/deploy/kubernetes/charts/carts/values.yaml
index 5e68740b2..d90afe09f 100644
--- a/deploy/kubernetes/charts/carts/values.yaml
+++ b/deploy/kubernetes/charts/carts/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: public.ecr.aws/aws-containers/retail-store-sample-cart
   pullPolicy: IfNotPresent
-  tag: 0.5.0
+  tag: 0.6.0
   
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/kubernetes/charts/catalog/values.yaml b/deploy/kubernetes/charts/catalog/values.yaml
index 3b95d3fd9..f5dfc4c02 100644
--- a/deploy/kubernetes/charts/catalog/values.yaml
+++ b/deploy/kubernetes/charts/catalog/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: public.ecr.aws/aws-containers/retail-store-sample-catalog
   pullPolicy: IfNotPresent
-  tag: 0.5.0
+  tag: 0.6.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/kubernetes/charts/checkout/values.yaml b/deploy/kubernetes/charts/checkout/values.yaml
index 98f8bb4e8..327df3996 100644
--- a/deploy/kubernetes/charts/checkout/values.yaml
+++ b/deploy/kubernetes/charts/checkout/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: public.ecr.aws/aws-containers/retail-store-sample-checkout
   pullPolicy: IfNotPresent
-  tag: 0.5.0
+  tag: 0.6.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/kubernetes/charts/orders/values.yaml b/deploy/kubernetes/charts/orders/values.yaml
index ea30cb748..388eaf3ac 100644
--- a/deploy/kubernetes/charts/orders/values.yaml
+++ b/deploy/kubernetes/charts/orders/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: public.ecr.aws/aws-containers/retail-store-sample-orders
   pullPolicy: IfNotPresent
-  tag: 0.5.0
+  tag: 0.6.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/kubernetes/charts/ui/values.yaml b/deploy/kubernetes/charts/ui/values.yaml
index a58380fbe..cf1d83cb5 100644
--- a/deploy/kubernetes/charts/ui/values.yaml
+++ b/deploy/kubernetes/charts/ui/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: public.ecr.aws/aws-containers/retail-store-sample-ui
   pullPolicy: IfNotPresent
-  tag: 0.5.0
+  tag: 0.6.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/terraform/lib/images/generated.tf.json b/deploy/terraform/lib/images/generated.tf.json
index 0b2ca866d..2100ce8d5 100644
--- a/deploy/terraform/lib/images/generated.tf.json
+++ b/deploy/terraform/lib/images/generated.tf.json
@@ -1,6 +1,6 @@
 {
   "locals": {
-    "published_tag": "0.5.0",
+    "published_tag": "0.6.0",
     "published_repository": "public.ecr.aws/aws-containers"
   }
 }
diff --git a/dist/docker-compose/docker-compose.yml b/dist/docker-compose/docker-compose.yml
index ca9549dd9..3bb7f8c73 100644
--- a/dist/docker-compose/docker-compose.yml
+++ b/dist/docker-compose/docker-compose.yml
@@ -28,14 +28,14 @@ services:
       - ENDPOINTS_CHECKOUT=http://checkout:8080
       - ENDPOINTS_ASSETS=http://assets:8080
     hostname: ui
-    image: public.ecr.aws/aws-containers/retail-store-sample-ui:0.5.0
+    image: public.ecr.aws/aws-containers/retail-store-sample-ui:0.6.0
     restart: always
     mem_limit: 512m
     cap_drop:
       - ALL
   catalog:
     hostname: catalog
-    image: public.ecr.aws/aws-containers/retail-store-sample-catalog:0.5.0
+    image: public.ecr.aws/aws-containers/retail-store-sample-catalog:0.6.0
     restart: always
     environment:
       - GIN_MODE=release
@@ -56,7 +56,7 @@ services:
     mem_limit: 128m
   carts:
     hostname: carts
-    image: public.ecr.aws/aws-containers/retail-store-sample-cart:0.5.0
+    image: public.ecr.aws/aws-containers/retail-store-sample-cart:0.6.0
     restart: always
     environment:
       - JAVA_OPTS=-XX:MaxRAMPercentage=75.0 -Djava.security.egd=file:/dev/urandom
@@ -76,7 +76,7 @@ services:
     mem_limit: 256m
   orders:
     hostname: orders
-    image: public.ecr.aws/aws-containers/retail-store-sample-orders:0.5.0
+    image: public.ecr.aws/aws-containers/retail-store-sample-orders:0.6.0
     restart: always
     environment:
       - JAVA_OPTS=-XX:MaxRAMPercentage=75.0 -Djava.security.egd=file:/dev/urandom
@@ -104,7 +104,7 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
     mem_limit: 128m
   checkout:
-    image: public.ecr.aws/aws-containers/retail-store-sample-checkout:0.5.0
+    image: public.ecr.aws/aws-containers/retail-store-sample-checkout:0.6.0
     hostname: checkout
     restart: always
     read_only: true
@@ -125,7 +125,7 @@ services:
     hostname: assets
     environment:
       - PORT=8080
-    image: public.ecr.aws/aws-containers/retail-store-sample-assets:0.5.0
+    image: public.ecr.aws/aws-containers/retail-store-sample-assets:0.6.0
     restart: always
     mem_limit: 64m
     cap_drop:
diff --git a/dist/kubernetes/deploy.yaml b/dist/kubernetes/deploy.yaml
index 740babb39..73ec0f7bb 100644
--- a/dist/kubernetes/deploy.yaml
+++ b/dist/kubernetes/deploy.yaml
@@ -19,7 +19,7 @@ metadata:
   name: catalog-db
 data:
   username: "Y2F0YWxvZw=="
-  password: "YzE5ZGVwTTRaTmg4OHBkUA=="
+  password: "eFZCbUNLOW1xbFFGTGhFdw=="
 ---
 # Source: catalog/templates/configmap.yml
 apiVersion: v1
@@ -141,7 +141,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "public.ecr.aws/aws-containers/retail-store-sample-catalog:0.5.0"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-catalog:0.6.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -329,7 +329,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "public.ecr.aws/aws-containers/retail-store-sample-ui:0.5.0"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-ui:0.6.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -376,7 +376,7 @@ metadata:
   name: catalog-db
 data:
   username: "Y2F0YWxvZw=="
-  password: "amJrcHh0Y3pkZHhqU21EaA=="
+  password: "amp1TEFHT3BWY3ZLNjAydQ=="
 ---
 # Source: catalog/templates/configmap.yml
 apiVersion: v1
@@ -498,7 +498,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "public.ecr.aws/aws-containers/retail-store-sample-catalog:0.5.0"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-catalog:0.6.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -712,7 +712,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "public.ecr.aws/aws-containers/retail-store-sample-cart:0.5.0"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-cart:0.6.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -793,7 +793,7 @@ metadata:
   name: orders-db
 data:
   username: "b3JkZXJz"
-  password: "Wk5QSHgwQ1lSWTBnUWg2WQ=="
+  password: "alN6anBCUDBscWtYUGxEWA=="
 ---
 # Source: orders/templates/rabbitmq-secret.yaml
 apiVersion: v1
@@ -964,7 +964,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "public.ecr.aws/aws-containers/retail-store-sample-orders:0.5.0"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-orders:0.6.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -1214,7 +1214,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "public.ecr.aws/aws-containers/retail-store-sample-checkout:0.5.0"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-checkout:0.6.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -1366,7 +1366,7 @@ spec:
               drop:
               - ALL
             readOnlyRootFilesystem: false
-          image: "public.ecr.aws/aws-containers/retail-store-sample-assets:0.5.0"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-assets:0.6.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -1500,7 +1500,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "public.ecr.aws/aws-containers/retail-store-sample-ui:0.5.0"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-ui:0.6.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http