diff --git a/.env b/.env
index 4812abeaa5..8a55fe4cdf 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 # compose
-IMAGE_VERSION=0.3.1-alpha
+IMAGE_VERSION=v0.3.4
 IMAGE_NAME=ghcr.io/open-telemetry/demo
 
 # Collector
diff --git a/docker-compose.yml b/docker-compose.yml
index d05e92cb03..3c9bd42bbc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,6 +52,10 @@ services:
     build:
       context: ./
       dockerfile: ./src/adservice/Dockerfile
+      # cache_from:
+      #   - ${IMAGE_NAME}:${IMAGE_VERSION}-adservice
+      # cache_to:
+      #   - inline # see https://github.com/moby/buildkit#export-cache
     ports:
       - "${AD_SERVICE_PORT}"
     environment:
@@ -70,6 +74,10 @@ services:
     build:
       context: ./
       dockerfile: ./src/cartservice/src/Dockerfile
+      # cache_from:
+      #   - ${IMAGE_NAME}:${IMAGE_VERSION}-cartservice
+      # cache_to:
+      #   - inline # see https://github.com/moby/buildkit#export-cache
     ports:
       - "${CART_SERVICE_PORT}"
     environment:
@@ -90,6 +98,10 @@ services:
     build:
       context: ./
       dockerfile: ./src/checkoutservice/Dockerfile
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-checkoutservice
+      cache_to:
+        - inline # see https://github.com/moby/buildkit#export-cache
     ports:
       - "${CHECKOUT_SERVICE_PORT}"
     environment:
@@ -118,6 +130,10 @@ services:
     container_name: currency-service
     build:
       context: ./src/currencyservice
+      # cache_from:
+      #   - ${IMAGE_NAME}:${IMAGE_VERSION}-currencyservice
+      # cache_to:
+      #   - inline # see https://github.com/moby/buildkit#export-cache
       args:
         - GRPC_VERSION=1.46.0
         - OPENTELEMETRY_VERSION=1.5.0
@@ -137,6 +153,10 @@ services:
     container_name: email-service
     build:
       context: ./src/emailservice
+      # cache_from:
+      #   - ${IMAGE_NAME}:${IMAGE_VERSION}-emailservice
+      # cache_to:
+      #   - inline # see https://github.com/moby/buildkit#export-cache
     ports:
       - "${EMAIL_SERVICE_PORT}"
     environment:
@@ -155,6 +175,10 @@ services:
     build:
       context: ./
       dockerfile: ./src/frontend/Dockerfile
+      # cache_from:
+      #   - ${IMAGE_NAME}:${IMAGE_VERSION}-frontend
+      # cache_to:
+      #   - inline # see https://github.com/moby/buildkit#export-cache
     ports:
       - "${FRONTEND_PORT}:${FRONTEND_PORT}"
     environment:
@@ -234,6 +258,10 @@ services:
     build:
       context: ./
       dockerfile: ./src/paymentservice/Dockerfile
+      # cache_from:
+      #   - ${IMAGE_NAME}:${IMAGE_VERSION}-paymentservice
+      # cache_to:
+      #   - inline # see https://github.com/moby/buildkit#export-cache
     ports:
       - "${PAYMENT_SERVICE_PORT}"
     environment:
@@ -251,6 +279,10 @@ services:
     build:
       context: ./
       dockerfile: ./src/productcatalogservice/Dockerfile
+      # cache_from:
+      #   - ${IMAGE_NAME}:${IMAGE_VERSION}-productcatalogservice
+      # cache_to:
+      #   - inline # see https://github.com/moby/buildkit#export-cache
     ports:
       - "${PRODUCT_CATALOG_SERVICE_PORT}"
     environment:
@@ -269,6 +301,10 @@ services:
     build:
       context: ./
       dockerfile: ./src/recommendationservice/Dockerfile
+      # cache_from:
+      #   - ${IMAGE_NAME}:${IMAGE_VERSION}-recommendationservice
+      # cache_to:
+      #   - inline # see https://github.com/moby/buildkit#export-cache
     ports:
       - "${RECOMMENDATION_SERVICE_PORT}"
     depends_on:
@@ -289,6 +325,10 @@ services:
     build:
       context: ./
       dockerfile: ./src/shippingservice/Dockerfile
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-shippingservice
+      cache_to:
+        - inline # see https://github.com/moby/buildkit#export-cache
     ports:
       - "${SHIPPING_SERVICE_PORT}"
     environment:
@@ -305,6 +345,10 @@ services:
     container_name: feature-flag-service
     build:
       context: ./src/featureflagservice
+      # cache_from:
+      #   - ${IMAGE_NAME}:${IMAGE_VERSION}-featureflagservice
+      # cache_to:
+      #   - inline # see https://github.com/moby/buildkit#export-cache
     ports:
       - "${FEATURE_FLAG_SERVICE_PORT}:${FEATURE_FLAG_SERVICE_PORT}"     # Feature Flag Service UI
       - "${FEATURE_FLAG_GRPC_SERVICE_PORT}"                             # Feature Flag Service gRPC API
@@ -341,6 +385,10 @@ services:
     build:
       context: ./
       dockerfile: ./src/loadgenerator/Dockerfile
+      # cache_from:
+      #   - ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator
+      # cache_to:
+      #   - inline # see https://github.com/moby/buildkit#export-cache
     ports:
       - "${LOCUST_WEB_PORT}:${LOCUST_WEB_PORT}"
     environment: