diff --git a/docker-files/siddhi-runner/alpine/base/Dockerfile b/docker-files/siddhi-runner/alpine/base/Dockerfile
index a52fc97..90c04b5 100644
--- a/docker-files/siddhi-runner/alpine/base/Dockerfile
+++ b/docker-files/siddhi-runner/alpine/base/Dockerfile
@@ -30,7 +30,7 @@ ARG USER_HOME=/home/${USER}
 ARG FILES=./files
 # set siddhi runner configurations
 ARG RUNTIME_SERVER=siddhi-runner
-ARG RUNTIME_SERVER_VERSION=5.1.0-m2
+ARG RUNTIME_SERVER_VERSION=5.1.0-alpha
 ARG RUNTIME_SERVER_PACK=${RUNTIME_SERVER}-${RUNTIME_SERVER_VERSION}
 ARG RUNTIME_SERVER_HOME=${USER_HOME}/${RUNTIME_SERVER}
 # set SIDDHI-IO EULA
diff --git a/docker-files/siddhi-runner/alpine/siddhi-runner/Dockerfile b/docker-files/siddhi-runner/alpine/siddhi-runner/Dockerfile
index 7029d80..8e89de8 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:5.1.0-m2
+FROM siddhiio/siddhi-runner-base-alpine:5.1.0-alpha
 MAINTAINER Siddhi IO Docker Maintainers "siddhi-dev@googlegroups.com"
 
 ARG HOST_BUNDLES_DIR=./files/bundles
diff --git a/docker-files/siddhi-runner/ubuntu/base/Dockerfile b/docker-files/siddhi-runner/ubuntu/base/Dockerfile
index f6736bd..16dab95 100644
--- a/docker-files/siddhi-runner/ubuntu/base/Dockerfile
+++ b/docker-files/siddhi-runner/ubuntu/base/Dockerfile
@@ -30,7 +30,7 @@ ARG USER_HOME=/home/${USER}
 ARG FILES=./files
 # set siddhi-runner configurations
 ARG RUNTIME_SERVER=siddhi-runner
-ARG RUNTIME_SERVER_VERSION=5.1.0-m2
+ARG RUNTIME_SERVER_VERSION=5.1.0-alpha
 ARG RUNTIME_SERVER_PACK=${RUNTIME_SERVER}-${RUNTIME_SERVER_VERSION}
 ARG RUNTIME_SERVER_HOME=${USER_HOME}/${RUNTIME_SERVER}
 # set SIDDHI-IO EULA
diff --git a/docker-files/siddhi-runner/ubuntu/siddhi-runner/Dockerfile b/docker-files/siddhi-runner/ubuntu/siddhi-runner/Dockerfile
index f0cecfe..6028de5 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:5.1.0-m2
+FROM siddhiio/siddhi-runner-base-ubuntu:5.1.0-alpha
 MAINTAINER Siddhi IO Docker Maintainers "siddhi-dev@googlegroups.com"
 
 ARG HOST_BUNDLES_DIR=./files/bundles
diff --git a/docker-files/siddhi-tooling/ubuntu/base/Dockerfile b/docker-files/siddhi-tooling/ubuntu/base/Dockerfile
index 0649bad..3ff6e0f 100644
--- a/docker-files/siddhi-tooling/ubuntu/base/Dockerfile
+++ b/docker-files/siddhi-tooling/ubuntu/base/Dockerfile
@@ -30,7 +30,7 @@ ARG USER_HOME=/home/${USER}
 ARG FILES=./files
 # set siddhi-tooling configurations
 ARG RUNTIME_SERVER=siddhi-tooling
-ARG RUNTIME_SERVER_VERSION=5.1.0-m2
+ARG RUNTIME_SERVER_VERSION=5.1.0-alpha
 ARG RUNTIME_SERVER_PACK=${RUNTIME_SERVER}-${RUNTIME_SERVER_VERSION}
 ARG RUNTIME_SERVER_HOME=${USER_HOME}/${RUNTIME_SERVER}
 # set SIDDHI-IO EULA
diff --git a/docker-files/siddhi-tooling/ubuntu/siddhi-tooling/Dockerfile b/docker-files/siddhi-tooling/ubuntu/siddhi-tooling/Dockerfile
index ff417ba..a25b508 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:5.1.0-m2
+FROM siddhiio/siddhi-tooling-base:5.1.0-alpha
 MAINTAINER Siddhi IO Docker Maintainers "siddhi-dev@googlegroups.com"
 
 ARG HOST_BUNDLES_DIR=./files/bundles