diff --git a/core/controller/Dockerfile b/core/controller/Dockerfile
index aca5947fc17..4602a87e9b2 100644
--- a/core/controller/Dockerfile
+++ b/core/controller/Dockerfile
@@ -40,10 +40,8 @@ RUN apt update &&\
 # Install docker client
 RUN curl -sSL -o docker-${DOCKER_VERSION}.tgz https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz && \
     tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker && \
-    tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker-runc && \
     rm -f docker-${DOCKER_VERSION}.tgz && \
-    chmod +x /usr/bin/docker && \
-    chmod +x /usr/bin/docker-runc
+    chmod +x /usr/bin/docker
 ##################################################################################################
 
 # Install swagger-ui
diff --git a/core/invoker/Dockerfile b/core/invoker/Dockerfile
index a603e1b7084..b812bf9140a 100644
--- a/core/invoker/Dockerfile
+++ b/core/invoker/Dockerfile
@@ -34,10 +34,8 @@ RUN apt update &&\
 # Install docker client
 RUN curl -sSL -o docker-${DOCKER_VERSION}.tgz https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz && \
     tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker && \
-    tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker-runc && \
     rm -f docker-${DOCKER_VERSION}.tgz && \
-    chmod +x /usr/bin/docker && \
-    chmod +x /usr/bin/docker-runc
+    chmod +x /usr/bin/docker
 
 ADD build/distributions/invoker.tar ./
 
diff --git a/core/standalone/Dockerfile b/core/standalone/Dockerfile
index 6b0138323e4..56af7327f3c 100644
--- a/core/standalone/Dockerfile
+++ b/core/standalone/Dockerfile
@@ -16,7 +16,7 @@
 #
 FROM scala
 ARG OPENWHISK_JAR
-ENV DOCKER_VERSION=18.06.3-ce
+ENV DOCKER_VERSION=24.0.6
 ENV WSK_VERSION=1.0.0
 ADD init /
 ADD stop waitready /bin/