diff --git a/.github/workflows/ci-assets.yml b/.github/workflows/ci-assets.yml
deleted file mode 100644
index f64133707..000000000
--- a/.github/workflows/ci-assets.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Assets CI
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "src/assets/**"
-  pull_request:
-    branches:
-      - main
-    paths:
-      - "src/assets/**"
-      - "images/**"
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    name: CI
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        id: qemu
-        uses: docker/setup-qemu-action@v2
-        with:
-          image: tonistiigi/binfmt:latest
-          platforms: all
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Expose GitHub Runtime
-        uses: crazy-max/ghaction-github-runtime@v2
-
-      - name: Build container image
-        run: |
-          scripts/build-image.sh -s assets -t ci
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 8efb76fc0..fb48ef5ae 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -33,8 +33,10 @@ jobs:
         shell: devenv shell bash -- -e {0}
         run: |
           MYSQL_PASSWORD='test123' yarn nx compose:up
-          sleep 60
-          MYSQL_PASSWORD='test123' yarn nx compose:up
+
+          CYPRESS_BASE_URL='http://localhost:8888' yarn nx test e2e
+
+          MYSQL_PASSWORD='test123' yarn nx compose:down
 
   kubernetes:
     name: Kubernetes E2E Tests
diff --git a/nx.json b/nx.json
index 7aaf9e9ec..5a4e8f8b8 100644
--- a/nx.json
+++ b/nx.json
@@ -36,7 +36,6 @@
         "cwd": "{projectRoot}"
       }
     },
-
     "serve": {
       "executor": "nx:run-commands",
       "options": {
@@ -53,7 +52,8 @@
       },
       "configurations": {
         "publish": {
-          "push": true
+          "push": true,
+          "platforms": ["linux/amd64", "linux/arm64"]
         }
       }
     }
diff --git a/src/cart/src/main/java/com/amazon/sample/carts/CartApplication.java b/src/cart/src/main/java/com/amazon/sample/carts/CartApplication.java
index 339020f4c..150712ec4 100644
--- a/src/cart/src/main/java/com/amazon/sample/carts/CartApplication.java
+++ b/src/cart/src/main/java/com/amazon/sample/carts/CartApplication.java
@@ -20,9 +20,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration;
 
-@SpringBootApplication(exclude = ActiveMQAutoConfiguration.class)
+@SpringBootApplication
 @SuppressWarnings("checkstyle:HideUtilityClassConstructor")
 public class CartApplication {
 
diff --git a/src/checkout/src/checkout/checkout.service.ts b/src/checkout/src/checkout/checkout.service.ts
index f36e96d56..fc660d1bd 100644
--- a/src/checkout/src/checkout/checkout.service.ts
+++ b/src/checkout/src/checkout/checkout.service.ts
@@ -62,7 +62,7 @@ export class CheckoutService {
       };
     });
 
-    const tax = request.shippingAddress ? Math.floor(subtotal * 0.05) : -1; // Hardcoded 5% tax for now
+    const tax = request.shippingAddress ? 5 : -1; // Hardcoded $10 tax for now
     const effectiveTax = tax == -1 ? 0 : tax;
 
     let shipping = -1;
diff --git a/src/checkout/src/checkout/shipping/MockShippingService.ts b/src/checkout/src/checkout/shipping/MockShippingService.ts
index dc55e48ec..b8ead9214 100644
--- a/src/checkout/src/checkout/shipping/MockShippingService.ts
+++ b/src/checkout/src/checkout/shipping/MockShippingService.ts
@@ -29,13 +29,13 @@ export class MockShippingService implements IShippingService {
       rates: [
         {
           name: `${this.prefix}Priority Mail`,
-          amount: 5,
+          amount: 10,
           token: 'priority-mail',
           estimatedDays: 10,
         },
         {
           name: `${this.prefix}Priority Mail Express`,
-          amount: 15,
+          amount: 25,
           token: 'priority-mail-express',
           estimatedDays: 5,
         },
diff --git a/src/e2e/cypress/e2e/catalog.cy.js b/src/e2e/cypress/e2e/catalog.cy.js
index 141088358..0d5aaac34 100644
--- a/src/e2e/cypress/e2e/catalog.cy.js
+++ b/src/e2e/cypress/e2e/catalog.cy.js
@@ -15,7 +15,7 @@ describe("testing catalog", () => {
       .cards()
       .first()
       .find(".product-name")
-      .should("contain.text", "The Quiet Quill");
+      .should("contain.text", "Audio-Illusion Spinner");
     catalog.cards().its("length").should("eq", 6);
   });
 
diff --git a/src/ui/src/main/java/com/amazon/sample/ui/services/catalog/MockCatalogService.java b/src/ui/src/main/java/com/amazon/sample/ui/services/catalog/MockCatalogService.java
index ea3569f4e..3de3fee20 100644
--- a/src/ui/src/main/java/com/amazon/sample/ui/services/catalog/MockCatalogService.java
+++ b/src/ui/src/main/java/com/amazon/sample/ui/services/catalog/MockCatalogService.java
@@ -24,7 +24,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -149,7 +149,11 @@ public Mono<ProductPage> getProducts(
     int page,
     int size
   ) {
-    List<Product> productList = new ArrayList<>(this.products.values());
+    List<Product> productList =
+      this.products.values()
+        .stream()
+        .sorted(Comparator.comparing(Product::getName))
+        .collect(Collectors.toList());
 
     int end = page * size;