diff --git a/docker-files/siddhi-parser/alpine/Dockerfile b/docker-files/siddhi-parser/alpine/Dockerfile
index 9dd09f4..b2f3928 100644
--- a/docker-files/siddhi-parser/alpine/Dockerfile
+++ b/docker-files/siddhi-parser/alpine/Dockerfile
@@ -30,7 +30,7 @@ ARG USER_HOME=/home/${USER}
 ARG FILES=./files
 # set siddhi runner configurations
 ARG SIDDHI_PARSER_SERVICE_PACKAGENAME=siddhi.parser
-ARG SIDDHI_PARSER_VERSION=0.1.0
+ARG SIDDHI_PARSER_VERSION=0.2.0-m1
 ARG SIDDHI_PARSER_SERVICE_JAR=${SIDDHI_PARSER_SERVICE_PACKAGENAME}-${SIDDHI_PARSER_VERSION}.jar
 # set SIDDHI-IO EULA
 ARG MOTD="\n\
@@ -58,4 +58,4 @@ ENV WORKING_DIRECTORY=${USER_HOME}
 # copy Siddhi Parser Service JAR and dependencies
 COPY --chown=siddhi_user:siddhi_io ./files ${WORKING_DIRECTORY}/
 
-CMD ["java", "-cp", "siddhi.parser-0.1.0.jar:lib/*", "io.siddhi.operator.parser.services.Application"]
+CMD ["java", "-cp", "siddhi.parser-0.2.0-m1.jar:lib/*", "io.siddhi.operator.parser.services.Application"]
diff --git a/docker-files/siddhi-parser/alpine/README.md b/docker-files/siddhi-parser/alpine/README.md
index affe43b..676afd4 100644
--- a/docker-files/siddhi-parser/alpine/README.md
+++ b/docker-files/siddhi-parser/alpine/README.md
@@ -1,6 +1,6 @@
 # Dockerfiles for Siddhi Parser #
 
-This section defines the step-by-step instructions to build [Ubuntu](https://hub.docker.com/_/ubuntu/) Linux based Docker image for Siddhi Parser Service 0.1.0.
+This section defines the step-by-step instructions to build [Ubuntu](https://hub.docker.com/_/ubuntu/) Linux based Docker image for Siddhi Parser Service 0.2.x.
 
 ## Prerequisites
 
@@ -22,11 +22,11 @@ git clone https://github.com/siddhi-io/docker-siddhi.git
 
 - Navigate to `<DOCKERFILE_HOME>` directory. <br>
   Execute `docker build` command as shown below.
-    + `docker build -t siddhi-parser-alpine:v0.1.0 .`
+    + `docker build -t siddhi-parser:0.2.x .`
     
 ##### 5. Running Docker image.
 
-    + `docker run -it siddhi-parser-alpine:v0.1.0`
+    + `docker run -it -p 9090:9090 siddhi-parser:0.2.x`
 
 ## Docker command usage references
 
diff --git a/docker-files/siddhi-parser/alpine/files/lib/.gitkeep b/docker-files/siddhi-parser/alpine/files/lib/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/docker-files/siddhi-runner/alpine/README.md b/docker-files/siddhi-runner/alpine/README.md
index b9a14eb..cc82a7f 100644
--- a/docker-files/siddhi-runner/alpine/README.md
+++ b/docker-files/siddhi-runner/alpine/README.md
@@ -1,6 +1,6 @@
 # Dockerfiles for Siddhi Runner #
 
-This section defines the step-by-step instructions to build [Alpine](https://hub.docker.com/_/alpine/) Linux based Docker image for Siddhi Runner Distribution 0.1.0.
+This section defines the step-by-step instructions to build [Alpine](https://hub.docker.com/_/alpine/) Linux based Docker image for Siddhi Runner Distribution 5.1.x.
 
 ## Prerequisites
 
@@ -23,25 +23,25 @@ git clone https://github.com/siddhi-io/docker-siddhi.git
 
 - For base, navigate to `<DOCKERFILE_HOME>/base` directory. <br>
   Execute `docker build` command as shown below.
-    + `docker build -t siddhi-runner-base-alpine:0.1.0 .`
+    + `docker build -t siddhiio/siddhi-runner-base-alpine:5.1.x .`
 
 ### Building the Siddhi Runner Image
 Here we create the Siddhi Runner image bundling the needed extensions and client jars.
 
 Optional: 
-> Use the `jartobundle.sh` script found in `siddhi-runner-0.1.0/bin` as shown below; note that you will have to run this command for each jar you need to bundle in the image.
+> Use the `jartobundle.sh` script found in `siddhi-runner-5.1.x/bin` as shown below; note that you will have to run this command for each jar you need to bundle in the image.
 
   ```
-  ./siddhi-runner-0.1.0/bin/jartobundle.sh path/to/kafka/client/jar <DOCKERFILE_HOME>/siddhi-runner/files/lib
+  ./siddhi-runner-5.1.x/bin/jartobundle.sh path/to/kafka/client/jar <DOCKERFILE_HOME>/siddhi-runner/files/lib
   ```        
 ##### 5. Build Docker image.
 
   Execute `docker build` command as shown below. 
-    + `docker build -t siddhi-runner-alpine:0.1.0 .`
+    + `docker build -t siddhi-runner-alpine:5.1.x .`
     
 ##### 6. Running Docker image.
 
-    + `docker run -it siddhi-runner-alpine:0.1.0`
+    + `docker run -it siddhi-runner-alpine:5.1.x`
 
 ## Docker command usage references
 
diff --git a/docker-files/siddhi-runner/alpine/base/Dockerfile b/docker-files/siddhi-runner/alpine/base/Dockerfile
index 2f736eb..8382317 100644
--- a/docker-files/siddhi-runner/alpine/base/Dockerfile
+++ b/docker-files/siddhi-runner/alpine/base/Dockerfile
@@ -30,9 +30,9 @@ ARG USER_HOME=/home/${USER}
 ARG FILES=./files
 # set siddhi runner configurations
 ARG RUNTIME_SERVER=siddhi-runner
-ARG RUNTIME_SERVER_VERSION=0.1.0
+ARG RUNTIME_SERVER_VERSION=5.1.0-m1
 ARG RUNTIME_SERVER_PACK=${RUNTIME_SERVER}-${RUNTIME_SERVER_VERSION}
-ARG RUNTIME_SERVER_HOME=${USER_HOME}/${RUNTIME_SERVER_PACK}
+ARG RUNTIME_SERVER_HOME=${USER_HOME}/${RUNTIME_SERVER}
 # set SIDDHI-IO EULA
 ARG MOTD="\n\
 Welcome to Siddhi Docker resources.\n\
@@ -55,7 +55,7 @@ RUN  addgroup -g ${USER_GROUP_ID} ${USER_GROUP}; \
 # download Siddhi Runner Distribution
 RUN \
     wget --no-check-certificate -O ${RUNTIME_SERVER_PACK}.zip "https://github.com/siddhi-io/distribution/releases/download/v${RUNTIME_SERVER_VERSION}/${RUNTIME_SERVER_PACK}.zip" \
-    && unzip -d ${USER_HOME} ${RUNTIME_SERVER_PACK}.zip \
+    && unzip -d ${USER_HOME} ${RUNTIME_SERVER_PACK}.zip && mv ${USER_HOME}/${RUNTIME_SERVER_PACK} ${RUNTIME_SERVER_HOME} \
     && chown ${USER}:${USER_GROUP} -R ${RUNTIME_SERVER_HOME} \
     && rm -f ${RUNTIME_SERVER_PACK}.zip
 
diff --git a/docker-files/siddhi-runner/alpine/siddhi-runner/Dockerfile b/docker-files/siddhi-runner/alpine/siddhi-runner/Dockerfile
index 958d86e..4ed42ed 100644
--- a/docker-files/siddhi-runner/alpine/siddhi-runner/Dockerfile
+++ b/docker-files/siddhi-runner/alpine/siddhi-runner/Dockerfile
@@ -17,7 +17,7 @@
 # ------------------------------------------------------------------------
 
 # use siddhi-runner-base
-FROM siddhiio/siddhi-runner-base-alpine:0.1.0
+FROM siddhiio/siddhi-runner-base-alpine:5.1.0-m1
 MAINTAINER Siddhi IO Docker Maintainers "siddhi-dev@googlegroups.com"
 
 ARG BUNDLE_JAR_DIR=./files/lib
diff --git a/docker-files/siddhi-runner/ubuntu/README.md b/docker-files/siddhi-runner/ubuntu/README.md
index 784495e..b299220 100644
--- a/docker-files/siddhi-runner/ubuntu/README.md
+++ b/docker-files/siddhi-runner/ubuntu/README.md
@@ -1,6 +1,6 @@
 # Dockerfiles for Siddhi Runner #
 
-This section defines the step-by-step instructions to build [Ubuntu](https://hub.docker.com/_/ubuntu/) Linux based Docker image for Siddhi Runner Distribution 0.1.0.
+This section defines the step-by-step instructions to build [Ubuntu](https://hub.docker.com/_/ubuntu/) Linux based Docker image for Siddhi Runner Distribution 5.1.x.
 
 ## Prerequisites
 
@@ -23,25 +23,25 @@ git clone https://github.com/siddhi-io/docker-siddhi.git
 
 - For base, navigate to `<DOCKERFILE_HOME>/base` directory. <br>
   Execute `docker build` command as shown below.
-    + `docker build -t siddhi-runner-base-ubuntu:0.1.0 .`
+    + `docker build -t siddhiio/siddhi-runner-base-ubuntu:5.1.x .`
 
 ### Building the Siddhi Runner Image
 Here we create the Siddhi Runner image bundling the needed extensions and client jars.
 
 Optional:  
-> Use the `jartobundle.sh` script found in `siddhi-runner-0.1.0/bin` as shown below; note that you will have to run this command for each jar you need to bundle in the image.
+> Use the `jartobundle.sh` script found in `siddhi-runner-5.1.x/bin` as shown below; note that you will have to run this command for each jar you need to bundle in the image.
 
   ```
-  ./siddhi-runner-0.1.0/bin/jartobundle.sh path/to/kafka/client/jar <DOCKERFILE_HOME>/siddhi-runner/files/lib
+  ./siddhi-runner-5.1.x/bin/jartobundle.sh path/to/kafka/client/jar <DOCKERFILE_HOME>/siddhi-runner/files/lib
   ```        
 ##### 3. Build Docker image.
 
   Execute `docker build` command as shown below. 
-    + `docker build -t siddhi-runner-ubuntu:0.1.0 .`
+    + `docker build -t siddhi-runner-ubuntu:5.1.x .`
     
 ##### 4. Running Docker image.
 
-    + `docker run -it siddhi-runner-ubuntu:0.1.0`
+    + `docker run -it siddhi-runner-ubuntu:5.1.x`
 
 ## Docker command usage references
 
diff --git a/docker-files/siddhi-runner/ubuntu/base/Dockerfile b/docker-files/siddhi-runner/ubuntu/base/Dockerfile
index b227460..6980bcd 100644
--- a/docker-files/siddhi-runner/ubuntu/base/Dockerfile
+++ b/docker-files/siddhi-runner/ubuntu/base/Dockerfile
@@ -30,9 +30,9 @@ ARG USER_HOME=/home/${USER}
 ARG FILES=./files
 # set siddhi-runner configurations
 ARG RUNTIME_SERVER=siddhi-runner
-ARG RUNTIME_SERVER_VERSION=0.1.0
+ARG RUNTIME_SERVER_VERSION=5.1.0-m1
 ARG RUNTIME_SERVER_PACK=${RUNTIME_SERVER}-${RUNTIME_SERVER_VERSION}
-ARG RUNTIME_SERVER_HOME=${USER_HOME}/${RUNTIME_SERVER_PACK}
+ARG RUNTIME_SERVER_HOME=${USER_HOME}/${RUNTIME_SERVER}
 # set SIDDHI-IO EULA
 ARG MOTD="\n\
 Welcome to Siddhi Docker resources.\n\
@@ -62,7 +62,7 @@ RUN \
 # download Siddhi Runner Distribution
 RUN \
     wget --no-check-certificate -O ${RUNTIME_SERVER_PACK}.zip "https://github.com/siddhi-io/distribution/releases/download/v${RUNTIME_SERVER_VERSION}/${RUNTIME_SERVER_PACK}.zip" \
-    && unzip -d ${USER_HOME} ${RUNTIME_SERVER_PACK}.zip \
+    && unzip -d ${USER_HOME} ${RUNTIME_SERVER_PACK}.zip && mv ${USER_HOME}/${RUNTIME_SERVER_PACK} ${RUNTIME_SERVER_HOME} \
     && chown ${USER}:${USER_GROUP} -R ${RUNTIME_SERVER_HOME} \
     && rm -f ${RUNTIME_SERVER_PACK}.zip
 
diff --git a/docker-files/siddhi-runner/ubuntu/siddhi-runner/Dockerfile b/docker-files/siddhi-runner/ubuntu/siddhi-runner/Dockerfile
index b7f6899..8a89df7 100644
--- a/docker-files/siddhi-runner/ubuntu/siddhi-runner/Dockerfile
+++ b/docker-files/siddhi-runner/ubuntu/siddhi-runner/Dockerfile
@@ -17,7 +17,7 @@
 # ------------------------------------------------------------------------
 
 # use siddhi-runner-base
-FROM siddhiio/siddhi-runner-base-ubuntu:0.1.0
+FROM siddhiio/siddhi-runner-base-ubuntu:5.1.0-m1
 MAINTAINER Siddhi IO Docker Maintainers "siddhi-dev@googlegroups.com"
 
 ARG BUNDLE_JAR_DIR=./files/lib
diff --git a/docker-files/siddhi-tooling/ubuntu/README.md b/docker-files/siddhi-tooling/ubuntu/README.md
index 4ff381e..99b9aec 100644
--- a/docker-files/siddhi-tooling/ubuntu/README.md
+++ b/docker-files/siddhi-tooling/ubuntu/README.md
@@ -1,6 +1,6 @@
 # Dockerfiles for Siddhi Tooling #
 
-This section defines the step-by-step instructions to build [Ubuntu](https://hub.docker.com/_/ubuntu/) Linux based Docker image for Siddhi Tooling Distribution 0.1.0.
+This section defines the step-by-step instructions to build [Ubuntu](https://hub.docker.com/_/ubuntu/) Linux based Docker image for Siddhi Tooling Distribution 5.1.x.
 
 ## Prerequisites
 
@@ -23,25 +23,25 @@ git clone https://github.com/siddhi-io/docker-siddhi.git
 
 - For base, navigate to `<DOCKERFILE_HOME>/base` directory. <br>
   Execute `docker build` command as shown below.
-    + `docker build -t siddhi-tooling-base:0.1.0 .`
+    + `docker build -t siddhiio/siddhi-tooling-base:5.1.x .`
 
 ### Building the Siddhi Tooling Image
 Here we create the Siddhi Tooling image bundling the needed extensions and client jars.
 
 Optional:  
-> Use the `jartobundle.sh` script found in `siddhi-tooling-0.1.0/bin` as shown below; note that you will have to run this command for each jar you need to bundle in the image.
+> Use the `jartobundle.sh` script found in `siddhi-tooling-5.1.x/bin` as shown below; note that you will have to run this command for each jar you need to bundle in the image.
 
   ```
-  ./siddhi-tooling-0.1.0/bin/jartobundle.sh path/to/kafka/client/jar <DOCKERFILE_HOME>/siddhi-tooling/files/lib
+  ./siddhi-tooling-5.1.x/bin/jartobundle.sh path/to/kafka/client/jar <DOCKERFILE_HOME>/siddhi-tooling/files/lib
   ```        
 ##### 3. Build Docker image.
 
   Execute `docker build` command as shown below. 
-    + `docker build -t siddhi-tooling:0.1.0 .`
+    + `docker build -t siddhi-tooling:5.1.x .`
     
 ##### 4. Running Docker image.
 
-    + `docker run -it siddhi-tooling:0.1.0`
+    + `docker run -it -p 9390:9390 siddhi-tooling:5.1.x`    
 
 ## Docker command usage references
 
diff --git a/docker-files/siddhi-tooling/ubuntu/base/Dockerfile b/docker-files/siddhi-tooling/ubuntu/base/Dockerfile
index 4a7b14b..a93f7a8 100644
--- a/docker-files/siddhi-tooling/ubuntu/base/Dockerfile
+++ b/docker-files/siddhi-tooling/ubuntu/base/Dockerfile
@@ -30,9 +30,9 @@ ARG USER_HOME=/home/${USER}
 ARG FILES=./files
 # set siddhi-tooling configurations
 ARG RUNTIME_SERVER=siddhi-tooling
-ARG RUNTIME_SERVER_VERSION=0.1.0
+ARG RUNTIME_SERVER_VERSION=5.1.0-m1
 ARG RUNTIME_SERVER_PACK=${RUNTIME_SERVER}-${RUNTIME_SERVER_VERSION}
-ARG RUNTIME_SERVER_HOME=${USER_HOME}/${RUNTIME_SERVER_PACK}
+ARG RUNTIME_SERVER_HOME=${USER_HOME}/${RUNTIME_SERVER}
 # set SIDDHI-IO EULA
 ARG MOTD="\n\
 Welcome to Siddhi Docker resources.\n\
@@ -62,7 +62,7 @@ RUN \
 # download Siddhi Tooling Distribution
 RUN \
     wget --no-check-certificate -O ${RUNTIME_SERVER_PACK}.zip "https://github.com/siddhi-io/distribution/releases/download/v${RUNTIME_SERVER_VERSION}/${RUNTIME_SERVER_PACK}.zip" \
-    && unzip -d ${USER_HOME} ${RUNTIME_SERVER_PACK}.zip \
+    && unzip -d ${USER_HOME} ${RUNTIME_SERVER_PACK}.zip && mv ${USER_HOME}/${RUNTIME_SERVER_PACK} ${RUNTIME_SERVER_HOME} \
     && chown ${USER}:${USER_GROUP} -R ${RUNTIME_SERVER_HOME} \
     && rm -f ${RUNTIME_SERVER_PACK}.zip
 
diff --git a/docker-files/siddhi-tooling/ubuntu/siddhi-tooling/Dockerfile b/docker-files/siddhi-tooling/ubuntu/siddhi-tooling/Dockerfile
index 5c0892a..b0a7971 100644
--- a/docker-files/siddhi-tooling/ubuntu/siddhi-tooling/Dockerfile
+++ b/docker-files/siddhi-tooling/ubuntu/siddhi-tooling/Dockerfile
@@ -17,7 +17,7 @@
 # ------------------------------------------------------------------------
 
 # use siddhi-tooling-base
-FROM siddhiio/siddhi-tooling-base:0.1.0
+FROM siddhiio/siddhi-tooling-base:5.1.0-m1
 MAINTAINER Siddhi IO Docker Maintainers "siddhi-dev@googlegroups.com"
 
 ARG BUNDLE_JAR_DIR=./files/lib