diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..9e3972c9
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,28 @@
+version: '2.1'
+
+services:
+  product:
+    build: product-service
+    mem_limit: 350m
+    environment:
+      - SPRING_PROFILES_ACTIVE=docker
+
+  recommendation:
+    build: recommendation-service
+    mem_limit: 350m
+    environment:
+      - SPRING_PROFILES_ACTIVE=docker
+
+  review:
+    build: review-service
+    mem_limit: 350m
+    environment:
+      - SPRING_PROFILES_ACTIVE=docker
+
+  product-composite:
+    build: product-composite-service
+    mem_limit: 350m
+    ports:
+      - "8080:8080"
+    environment:
+      - SPRING_PROFILES_ACTIVE=docker
diff --git a/product-composite-service/Dockerfile b/product-composite-service/Dockerfile
new file mode 100644
index 00000000..eb7ba1d7
--- /dev/null
+++ b/product-composite-service/Dockerfile
@@ -0,0 +1,53 @@
+#### Start of builder image
+# ------------------------
+# Builder stage to prepare application for final image
+FROM openjdk:14-slim-buster as builder
+WORKDIR temp
+
+# Could be set to different jar file location
+ARG JAR_FILE=target/*.jar
+
+# Copy fat jar file to current image builder
+COPY ${JAR_FILE} application.jar
+
+# Extract the jar file layers
+RUN java -Djarmode=layertools -jar --enable-preview application.jar extract
+#### End of builder stage
+
+#### Start of actual image
+# ------------------------
+# Build image based on JDK 14 base image, based on latest debian buster OS
+FROM openjdk:14-slim-buster
+
+# Set image information, but could be set to different location from command line
+ARG IMAGE_VERSION="0.0.1-SNAPSHOT"
+ARG IMAGE_NAME="Product Composite Service"
+ARG MAINTAINER="Mohamed Taman <mohamed.taman@gmail.com>"
+
+LABEL version=${IMAGE_VERSION} name=${IMAGE_NAME} maintainer=${MAINTAINER}
+
+# Limiting security access to not user root user
+RUN addgroup siriusxi && useradd -g siriusxi -ms /bin/bash taman
+
+# Setting user to current created user
+USER taman
+
+# Set working directory to application folder
+WORKDIR /home/taman/application
+
+# Copy all layers from builder stage to current image
+COPY --from=builder temp/dependencies/ ./
+COPY --from=builder temp/snapshot-dependencies/ ./
+COPY --from=builder temp/resources/ ./
+COPY --from=builder temp/application/ ./
+
+# Expose current application to port 8080
+EXPOSE 8080
+
+ARG JAVA_OPTS=""
+
+# Run the application with JVM configs if any
+ENTRYPOINT ["bash", "-c", \
+"java -server --enable-preview -XX:+UseContainerSupport \
+-XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \
+org.springframework.boot.loader.JarLauncher ${0} ${@}"]
\ No newline at end of file
diff --git a/product-composite-service/pom.xml b/product-composite-service/pom.xml
index 658dd259..adc103f4 100644
--- a/product-composite-service/pom.xml
+++ b/product-composite-service/pom.xml
@@ -14,4 +14,9 @@
 	<name>Product Composite Service</name>
 	<description>Product Composite Service Spring Boot based project</description>
 
+	<properties>
+		<skip.dockerization>false</skip.dockerization>
+		<skip.image.build>false</skip.image.build>
+	</properties>
+
 </project>
diff --git a/product-composite-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/product-composite-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 00000000..c8fce465
--- /dev/null
+++ b/product-composite-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,33 @@
+{
+  "properties": [
+    {
+      "name": "app.product-service.host",
+      "type": "java.lang.String",
+      "description": "Description for app.product-service.host."
+    },
+    {
+      "name": "app.product-service.port",
+      "type": "java.lang.Integer",
+      "description": "Description for app.product-service.port."
+    },
+    {
+      "name": "app.recommendation-service.host",
+      "type": "java.lang.String",
+      "description": "Description for app.recommendation-service.host."
+    },
+    {
+      "name": "app.recommendation-service.port",
+      "type": "java.lang.Integer",
+      "description": "Description for app.recommendation-service.port."
+    },
+    {
+      "name": "app.review-service.host",
+      "type": "java.lang.String",
+      "description": "Description for app.review-service.host."
+    },
+    {
+      "name": "app.review-service.port",
+      "type": "java.lang.Integer",
+      "description": "Description for app.review-service.port."
+    }
+  ] }
\ No newline at end of file
diff --git a/product-composite-service/src/main/resources/application.yaml b/product-composite-service/src/main/resources/application.yaml
index 3c8fe449..9017d16e 100644
--- a/product-composite-service/src/main/resources/application.yaml
+++ b/product-composite-service/src/main/resources/application.yaml
@@ -30,4 +30,27 @@ app:
     port: 9082
   review-service:
     host: localhost
-    port: 9083
\ No newline at end of file
+    port: 9083
+
+# This is a docker specific profile properties
+# Also profiles could be separated in its owen file
+# with file name format of "application-docker.yaml"
+---
+spring:
+  profiles: docker
+  jmx:
+    enabled: false
+
+server:
+  port: 8080
+
+app:
+  product-service:
+    host: product
+    port: 8080
+  recommendation-service:
+    host: recommendation
+    port: 8080
+  review-service:
+    host: review
+    port: 8080
\ No newline at end of file
diff --git a/product-service/Dockerfile b/product-service/Dockerfile
new file mode 100644
index 00000000..492c8e38
--- /dev/null
+++ b/product-service/Dockerfile
@@ -0,0 +1,54 @@
+#### Start of builder image
+# ------------------------
+# Builder stage to prepare application for final image
+FROM openjdk:14-slim-buster as builder
+WORKDIR temp
+
+# Fatjar location, but could be set to different location from command line
+ARG JAR_FILE=target/*.jar
+
+# Copy fat jar file to current image builder
+COPY ${JAR_FILE} application.jar
+
+# Extract the jar file layers
+RUN java -Djarmode=layertools -jar --enable-preview application.jar extract
+#### End of builder stage
+
+#### Start of actual image
+# ------------------------
+# Build image based on JDK 14 base image, based on latest debian buster OS
+FROM openjdk:14-slim-buster
+MAINTAINER Mohamed Taman <mohamed.taman@gmail.com>
+
+# Set image information, but could be set to different location from command line
+ARG IMAGE_VERSION="0.0.1-SNAPSHOT"
+ARG IMAGE_NAME="Product Service"
+ARG MAINTAINER="Mohamed Taman <mohamed.taman@gmail.com>"
+
+LABEL version=${IMAGE_VERSION} name=${IMAGE_NAME} maintainer=${MAINTAINER}
+
+# Limiting security access to not user root user
+RUN addgroup siriusxi && useradd -g siriusxi -ms /bin/bash taman
+
+# Setting user to current created user
+USER taman
+
+# Set working directory to application folder
+WORKDIR /home/taman/application
+
+# Copy all layers from builder stage to current image
+COPY --from=builder temp/dependencies/ ./
+COPY --from=builder temp/snapshot-dependencies/ ./
+COPY --from=builder temp/resources/ ./
+COPY --from=builder temp/application/ ./
+
+# Expose current application to port 8080
+EXPOSE 8080
+
+ARG JAVA_OPTS=""
+
+# Run the application with JVM configs if any
+ENTRYPOINT ["bash", "-c", \
+"java -server --enable-preview -XX:+UseContainerSupport \
+-XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \
+org.springframework.boot.loader.JarLauncher ${0} ${@}"]
\ No newline at end of file
diff --git a/product-service/pom.xml b/product-service/pom.xml
index cbedb927..654737e2 100644
--- a/product-service/pom.xml
+++ b/product-service/pom.xml
@@ -14,4 +14,9 @@
 	<name>Product Service</name>
 	<description>Product Service Spring Boot based project</description>
 
+	<properties>
+		<skip.dockerization>false</skip.dockerization>
+		<skip.image.build>false</skip.image.build>
+	</properties>
+
 </project>
diff --git a/product-service/src/main/resources/application.yaml b/product-service/src/main/resources/application.yaml
index 2e84cb35..e14a686a 100644
--- a/product-service/src/main/resources/application.yaml
+++ b/product-service/src/main/resources/application.yaml
@@ -18,4 +18,16 @@ management:
         include: "*"
   endpoint:
     shutdown:
-      enabled: true
\ No newline at end of file
+      enabled: true
+
+# This is a docker specific profile properties
+# Also profiles could be separated in its owen file
+# with file name format of "application-docker.yaml"
+---
+spring:
+  profiles: docker
+  jmx:
+    enabled: false
+
+server:
+  port: 8080
\ No newline at end of file
diff --git a/recommendation-service/Dockerfile b/recommendation-service/Dockerfile
new file mode 100644
index 00000000..75ab08b9
--- /dev/null
+++ b/recommendation-service/Dockerfile
@@ -0,0 +1,54 @@
+#### Start of builder image
+# ------------------------
+# Builder stage to prepare application for final image
+FROM openjdk:14-slim-buster as builder
+WORKDIR temp
+
+# Could be set to different jar file location
+ARG JAR_FILE=target/*.jar
+
+# Copy fat jar file to current image builder
+COPY ${JAR_FILE} application.jar
+
+# Extract the jar file layers
+RUN java -Djarmode=layertools -jar --enable-preview application.jar extract
+#### End of builder stage
+
+#### Start of actual image
+# ------------------------
+# Build image based on JDK 14 base image, based on latest debian buster OS
+FROM openjdk:14-slim-buster
+MAINTAINER Mohamed Taman <mohamed.taman@gmail.com>
+
+# Set image information, but could be set to different location from command line
+ARG IMAGE_VERSION="0.0.1-SNAPSHOT"
+ARG IMAGE_NAME="Recommendation Service"
+ARG MAINTAINER="Mohamed Taman <mohamed.taman@gmail.com>"
+
+LABEL version=${IMAGE_VERSION} name=${IMAGE_NAME} maintainer=${MAINTAINER}
+
+# Limiting security access to not user root user
+RUN addgroup siriusxi && useradd -g siriusxi -ms /bin/bash taman
+
+# Setting user to current created user
+USER taman
+
+# Set working directory to application folder
+WORKDIR /home/taman/application
+
+# Copy all layers from builder stage to current image
+COPY --from=builder temp/dependencies/ ./
+COPY --from=builder temp/snapshot-dependencies/ ./
+COPY --from=builder temp/resources/ ./
+COPY --from=builder temp/application/ ./
+
+# Expose current application to port 8080
+EXPOSE 8080
+
+ARG JAVA_OPTS=""
+
+# Run the application with JVM configs if any
+ENTRYPOINT ["bash", "-c", \
+"java -server --enable-preview -XX:+UseContainerSupport \
+-XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \
+org.springframework.boot.loader.JarLauncher ${0} ${@}"]
\ No newline at end of file
diff --git a/recommendation-service/pom.xml b/recommendation-service/pom.xml
index dbded8af..c9106565 100644
--- a/recommendation-service/pom.xml
+++ b/recommendation-service/pom.xml
@@ -14,4 +14,9 @@
 	<name>Recommendation Service</name>
 	<description>Recommendation Service Spring Boot based project</description>
 
+	<properties>
+		<skip.dockerization>false</skip.dockerization>
+		<skip.image.build>false</skip.image.build>
+	</properties>
+
 </project>
diff --git a/recommendation-service/src/main/resources/application.yaml b/recommendation-service/src/main/resources/application.yaml
index fe117b8f..d0af2644 100644
--- a/recommendation-service/src/main/resources/application.yaml
+++ b/recommendation-service/src/main/resources/application.yaml
@@ -19,3 +19,15 @@ management:
   endpoint:
     shutdown:
       enabled: true
+
+# This is a docker specific profile properties
+# Also profiles could be separated in its owen file
+# with file name format of "application-docker.yaml"
+---
+spring:
+  profiles: docker
+  jmx:
+    enabled: false
+
+server:
+  port: 8080
diff --git a/review-service/Dockerfile b/review-service/Dockerfile
new file mode 100644
index 00000000..37564580
--- /dev/null
+++ b/review-service/Dockerfile
@@ -0,0 +1,54 @@
+#### Start of builder image
+# ------------------------
+# Builder stage to prepare application for final image
+FROM openjdk:14-slim-buster as builder
+WORKDIR temp
+
+# Could be set to different jar file location
+ARG JAR_FILE=target/*.jar
+
+# Copy fat jar file to current image builder
+COPY ${JAR_FILE} application.jar
+
+# Extract the jar file layers
+RUN java -Djarmode=layertools -jar --enable-preview application.jar extract
+#### End of builder stage
+
+#### Start of actual image
+# ------------------------
+# Build image based on JDK 14 base image, based on latest debian buster OS
+FROM openjdk:14-slim-buster
+MAINTAINER Mohamed Taman <mohamed.taman@gmail.com>
+
+# Set image information, but could be set to different location from command line
+ARG IMAGE_VERSION="0.0.1-SNAPSHOT"
+ARG IMAGE_NAME="Review Service"
+ARG MAINTAINER="Mohamed Taman <mohamed.taman@gmail.com>"
+
+LABEL version=${IMAGE_VERSION} name=${IMAGE_NAME} maintainer=${MAINTAINER}
+
+# Limiting security access to not user root user
+RUN addgroup siriusxi && useradd -g siriusxi -ms /bin/bash taman
+
+# Setting user to current created user
+USER taman
+
+# Set working directory to application folder
+WORKDIR /home/taman/application
+
+# Copy all layers from builder stage to current image
+COPY --from=builder temp/dependencies/ ./
+COPY --from=builder temp/snapshot-dependencies/ ./
+COPY --from=builder temp/resources/ ./
+COPY --from=builder temp/application/ ./
+
+# Expose current application to port 8080
+EXPOSE 8080
+
+ARG JAVA_OPTS=""
+
+# Run the application with JVM configs if any
+ENTRYPOINT ["bash", "-c", \
+"java -server --enable-preview -XX:+UseContainerSupport \
+-XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \
+org.springframework.boot.loader.JarLauncher ${0} ${@}"]
\ No newline at end of file
diff --git a/review-service/pom.xml b/review-service/pom.xml
index ab68e6bb..653471f6 100644
--- a/review-service/pom.xml
+++ b/review-service/pom.xml
@@ -14,4 +14,9 @@
 	<name>Review Service</name>
 	<description>Review Service Spring Boot based project</description>
 
+	<properties>
+		<skip.dockerization>false</skip.dockerization>
+		<skip.image.build>false</skip.image.build>
+	</properties>
+
 </project>
diff --git a/review-service/src/main/resources/application.yaml b/review-service/src/main/resources/application.yaml
index e00c7614..21f2c40b 100644
--- a/review-service/src/main/resources/application.yaml
+++ b/review-service/src/main/resources/application.yaml
@@ -18,4 +18,16 @@ management:
         include: "*"
   endpoint:
     shutdown:
-      enabled: true
\ No newline at end of file
+      enabled: true
+
+# This is a docker specific profile properties
+# Also profiles could be separated in its owen file
+# with file name format of "application-docker.yaml"
+---
+spring:
+  profiles: docker
+  jmx:
+    enabled: false
+
+server:
+  port: 8080
\ No newline at end of file
diff --git a/store-api/pom.xml b/store-api/pom.xml
index 40e06f27..43c417bb 100644
--- a/store-api/pom.xml
+++ b/store-api/pom.xml
@@ -17,7 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!-- Libraries versions -->
-        <spring.boot.dependencies.version>2.2.3.BUILD-SNAPSHOT</spring.boot.dependencies.version>
+        <spring.boot.dependencies.version>2.3.0.M3</spring.boot.dependencies.version>
         <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
         <maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>
         <maven.failsafe.plugin.version>3.0.0-M4</maven.failsafe.plugin.version>
diff --git a/store-chassis/pom.xml b/store-chassis/pom.xml
index ad2e14a3..e181abfc 100644
--- a/store-chassis/pom.xml
+++ b/store-chassis/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <!-- FIXME change this version to 2.3.0.M4 that fixes ASM8_EXPERIMENTAL when using JDK 14
-         record feature -->
-        <version>2.3.0.M2</version>
+        <version>2.3.0.M4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -16,7 +15,7 @@
     <version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Springy Store Chassis</name>
-    <description>Parent pom project for Spring Boot μServices</description>
+    <description>Parent pom project for Springy μServices</description>
 
     <modules>
         <module>../product-composite-service</module>
@@ -31,6 +30,19 @@
         <java.version>14</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <!--  Dependencies versions properties  -->
+        <dockerfile-maven-version>1.4.13</dockerfile-maven-version>
+
+        <!--  Custom properties  -->
+        <maintainer.name>Mohamed Taman</maintainer.name>
+        <maintainer.email>mohamed.taman@gmail.com</maintainer.email>
+        <docker.repo.image.prefix>siriusxi</docker.repo.image.prefix>
+        <docker.image.default.tag>latest</docker.image.default.tag>
+        <skip.dockerization>true</skip.dockerization>
+        <skip.image.build>true</skip.image.build>
+        <skip.image.tag>true</skip.image.tag>
+        <skip.image.push>true</skip.image.push>
     </properties>
 
     <dependencies>
@@ -80,7 +92,7 @@
             <artifactId>reactor-test</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <!-- Application business dependencies to be inherited by all sub-modules -->
         <dependency>
             <groupId>com.siriusxi.ms.store</groupId>
             <artifactId>store-api</artifactId>
@@ -99,6 +111,12 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!-- Make final jar, a layered jar -->
+                    <layers>
+                        <enabled>true</enabled>
+                    </layers>
+                </configuration>
             </plugin>
 
             <plugin>
@@ -123,6 +141,62 @@
                 </configuration>
             </plugin>
 
+            <!-- Start docker image build plugin -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${dockerfile-maven-version}</version>
+                <executions>
+                    <execution>
+                        <id>build-image</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                        <configuration>
+                            <skipBuild>${skip.image.build}</skipBuild>
+                            <repository>${docker.repo.image.prefix}/${project.artifactId}</repository>
+                            <tag>${docker.image.default.tag}</tag>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>tag-image</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>tag</goal>
+                        </goals>
+                        <configuration>
+                            <skipTag>${skip.image.tag}</skipTag>
+                            <tag>${project.version}</tag>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>push-image</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>push</goal>
+                        </goals>
+                        <configuration>
+                            <skipPush>${skip.image.push}</skipPush>
+                            <tag>${project.version}</tag>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skip>${skip.dockerization}</skip>
+                    <dockerfile>Dockerfile</dockerfile>
+                    <repository>${docker.repo.image.prefix}/${project.artifactId}</repository>
+                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                    <buildArgs>
+                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                        <IMAGE_VERSION>${project.version}</IMAGE_VERSION>
+                        <IMAGE_NAME>${project.name}</IMAGE_NAME>
+                        <MAINTAINER>"${maintainer.name} (${maintainer.email})"</MAINTAINER>
+                    </buildArgs>
+                </configuration>
+            </plugin>
+            <!-- End docker image build plugin -->
+
         </plugins>
     </build>
 
diff --git a/store-utils/pom.xml b/store-utils/pom.xml
index aacd0357..d0ce4fa9 100644
--- a/store-utils/pom.xml
+++ b/store-utils/pom.xml
@@ -17,7 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!-- Libraries versions -->
-        <spring.boot.dependencies.version>2.2.3.BUILD-SNAPSHOT</spring.boot.dependencies.version>
+        <spring.boot.dependencies.version>2.3.0.M3</spring.boot.dependencies.version>
         <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
         <maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>
         <maven.failsafe.plugin.version>3.0.0-M4</maven.failsafe.plugin.version>
diff --git a/test-em-all.sh b/test-em-all.sh
index fd047b53..9413eb9f 100644
--- a/test-em-all.sh
+++ b/test-em-all.sh
@@ -2,13 +2,15 @@
 ## Author: Mohamed Taman
 ## version: v1.0
 ### Sample usage:
-#
-#   HOST=localhost PORT=9080 ./test-em-all.bash
+#   for local run
+#     HOST=localhost PORT=9080 ./test-em-all.bash
+#   with docker compose
+#     HOST=localhost PORT=8080 ./test-em-all.bash start stop
 #
 echo -e "Starting [Springy Store] full functionality testing....\n"
 
 : ${HOST=localhost}
-: ${PORT=9080}
+: ${PORT=8080}
 
 function assertCurl() {
 
@@ -48,11 +50,54 @@ function assertEqual() {
   fi
 }
 
+function testUrl() {
+    url=$@
+    if curl ${url} -ks -f -o /dev/null
+    then
+          echo "Ok"
+          return 0
+    else
+          echo -n "not yet"
+          return 1
+    fi;
+}
+
+function waitForService() {
+    url=$@
+    echo -n "Wait for: $url... "
+    n=0
+    until testUrl ${url}
+    do
+        n=$((n + 1))
+        if [[ ${n} == 100 ]]
+        then
+            echo " Give up"
+            exit 1
+        else
+            sleep 6
+            echo -n ", retry #$n "
+        fi
+    done
+}
+
 set -e
 
+echo "Start:" `date`
+
 echo "HOST=${HOST}"
 echo "PORT=${PORT}"
 
+if [[ $@ == *"start"* ]]
+then
+    echo "Restarting the test environment..."
+    echo "$ docker-compose down"
+    docker-compose down
+    echo "$ docker-compose -p ssm up -d"
+    docker-compose up -d
+fi
+
+waitForService http://${HOST}:${PORT}/product-composite/1
+
 # Verify that a normal request works, expect three recommendations and three reviews
 assertCurl 200 "curl http://$HOST:$PORT/product-composite/1 -s"
 assertEqual 1 $(echo ${RESPONSE} | jq .productId)
@@ -82,3 +127,11 @@ assertEqual "\"Invalid productId: -1\"" "$(echo ${RESPONSE} | jq .message)"
 assertCurl 400 "curl http://$HOST:$PORT/product-composite/invalidProductId -s"
 assertEqual "\"Type mismatch.\"" "$(echo ${RESPONSE} | jq .message)"
 
+if [[ $@ == *"stop"* ]]
+then
+    echo "We are done, stopping the test environment..."
+    echo "$ docker-compose down"
+    docker-compose down
+fi
+
+echo "End:" `date`
\ No newline at end of file