diff --git a/deploy/kubernetes/charts/assets/values.yaml b/deploy/kubernetes/charts/assets/values.yaml
index 95cedb50b..3ce10ced7 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.7.1
+  tag: 0.8.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/kubernetes/charts/carts/values.yaml b/deploy/kubernetes/charts/carts/values.yaml
index a7e26c765..aadafd784 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.7.1
+  tag: 0.8.0
   
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/kubernetes/charts/catalog/values.yaml b/deploy/kubernetes/charts/catalog/values.yaml
index d92ae2aad..61cf99294 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.7.1
+  tag: 0.8.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/kubernetes/charts/checkout/values.yaml b/deploy/kubernetes/charts/checkout/values.yaml
index 16bb8769d..d6bfa268c 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.7.1
+  tag: 0.8.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/kubernetes/charts/orders/values.yaml b/deploy/kubernetes/charts/orders/values.yaml
index 78efa6274..03819eeee 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.7.1
+  tag: 0.8.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/kubernetes/charts/ui/values.yaml b/deploy/kubernetes/charts/ui/values.yaml
index e84a80d36..9115641ce 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.7.1
+  tag: 0.8.0
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/deploy/terraform/lib/images/generated.tf.json b/deploy/terraform/lib/images/generated.tf.json
index 387730f77..53e6d67d5 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.7.1",
+    "published_tag": "0.8.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 8aece3bce..c60bd20d9 100644
--- a/dist/docker-compose/docker-compose.yml
+++ b/dist/docker-compose/docker-compose.yml
@@ -14,7 +14,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-version: '2'
+version: "2"
 services:
   ui:
     ports:
@@ -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.7.1
+    image: public.ecr.aws/aws-containers/retail-store-sample-ui:0.8.0
     restart: always
     mem_limit: 512m
     cap_drop:
       - ALL
   catalog:
     hostname: catalog
-    image: public.ecr.aws/aws-containers/retail-store-sample-catalog:0.7.1
+    image: public.ecr.aws/aws-containers/retail-store-sample-catalog:0.8.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.7.1
+    image: public.ecr.aws/aws-containers/retail-store-sample-cart:0.8.0
     restart: always
     environment:
       - JAVA_OPTS=-XX:MaxRAMPercentage=75.0 -Djava.security.egd=file:/dev/urandom
@@ -76,12 +76,12 @@ services:
     mem_limit: 256m
   orders:
     hostname: orders
-    image: public.ecr.aws/aws-containers/retail-store-sample-orders:0.7.1
+    image: public.ecr.aws/aws-containers/retail-store-sample-orders:0.8.0
     restart: always
     environment:
       - JAVA_OPTS=-XX:MaxRAMPercentage=75.0 -Djava.security.egd=file:/dev/urandom
       - SERVER_TOMCAT_ACCESSLOG_ENABLED=true
-      - SPRING_PROFILES_ACTIVE=rabbitmq
+      - RETAIL_ORDERS_MESSAGING_PROVIDER=rabbitmq
       - SPRING_DATASOURCE_URL=jdbc:postgresql://orders-db:5432/orders
       - SPRING_DATASOURCE_USERNAME=orders_user
       - SPRING_DATASOURCE_PASSWORD=${MYSQL_PASSWORD}
@@ -107,7 +107,7 @@ services:
       retries: 30
     mem_limit: 128m
   checkout:
-    image: public.ecr.aws/aws-containers/retail-store-sample-checkout:0.7.1
+    image: public.ecr.aws/aws-containers/retail-store-sample-checkout:0.8.0
     hostname: checkout
     restart: always
     read_only: true
@@ -128,7 +128,7 @@ services:
     hostname: assets
     environment:
       - PORT=8080
-    image: public.ecr.aws/aws-containers/retail-store-sample-assets:0.7.1
+    image: public.ecr.aws/aws-containers/retail-store-sample-assets:0.8.0
     restart: always
     mem_limit: 64m
     cap_drop:
diff --git a/dist/kubernetes/deploy.yaml b/dist/kubernetes/deploy.yaml
index 6e096d0b5..909a76c80 100644
--- a/dist/kubernetes/deploy.yaml
+++ b/dist/kubernetes/deploy.yaml
@@ -19,7 +19,7 @@ metadata:
   name: catalog-db
 data:
   username: "Y2F0YWxvZw=="
-  password: "aGNzNXhpcXY3M09PcEx3UQ=="
+  password: "dnk1dzdEVEFGUjhVOEhhTA=="
 ---
 # 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.7.1"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-catalog:0.8.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -355,7 +355,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "public.ecr.aws/aws-containers/retail-store-sample-cart:0.7.1"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-cart:0.8.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -436,7 +436,7 @@ metadata:
   name: orders-db
 data:
   username: "b3JkZXJz"
-  password: "T2NBdXcyb2dTbzYzeWUwTA=="
+  password: "NExHQUp2VHk1enY5RURhVQ=="
 ---
 # Source: orders/templates/rabbitmq-secret.yaml
 apiVersion: v1
@@ -596,7 +596,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "public.ecr.aws/aws-containers/retail-store-sample-orders:0.7.1"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-orders:0.8.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -844,7 +844,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "public.ecr.aws/aws-containers/retail-store-sample-checkout:0.7.1"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-checkout:0.8.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -996,7 +996,7 @@ spec:
               drop:
               - ALL
             readOnlyRootFilesystem: false
-          image: "public.ecr.aws/aws-containers/retail-store-sample-assets:0.7.1"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-assets:0.8.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -1130,7 +1130,7 @@ spec:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
             runAsUser: 1000
-          image: "public.ecr.aws/aws-containers/retail-store-sample-ui:0.7.1"
+          image: "public.ecr.aws/aws-containers/retail-store-sample-ui:0.8.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http