diff --git a/6/6.0-beta/base/Dockerfile b/6/6.0-beta/base/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..46184d6b53ba24424ba879e5feb27323f51ccad1
--- /dev/null
+++ b/6/6.0-beta/base/Dockerfile
@@ -0,0 +1,90 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM openjdk:8-jre-alpine
+
+LABEL maintainer="hanahmily@apache.org"
+
+# Install required packages
+RUN apk add --no-cache \
+    bash \
+    python \
+    su-exec
+
+
+ENV SKYWALKING_HOME=/skywalking
+RUN mkdir -p "${SKYWALKING_HOME}"
+WORKDIR $SKYWALKING_HOME
+
+ENV GPG_KEYS A968F6905E0ACB59E5B24C15D3D9CD50820184C2 B0801BC746F965029A1338072EF5026E70A55777 D360AB2AB20B28403270E2CBE8608938DB25E06B
+ENV SKYWALKING_VERSION=6.0.0-beta
+ENV SKYWALKING_SHA512 c050dd52993ec61de487cd37de6d024862a8e0f32751ccc3fb8faefd87ca0a9bc73cdf9126d0af4178fecac9750e9348e624b658bd49c1af53084961cf056e53
+
+ENV SKYWALKING_TGZ_URLS \
+        https://www.apache.org/dyn/closer.cgi?action=download&filename=incubator/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-incubating-$SKYWALKING_VERSION.tar.gz \
+        # if the version is outdated, we might have to pull from the dist/archive :/
+	    https://www-us.apache.org/dist/incubator/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-incubating-$SKYWALKING_VERSION.tar.gz \
+	    https://www.apache.org/dist/incubator/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-incubating-$SKYWALKING_VERSION.tar.gz \
+	    https://archive.apache.org/dist/incubator/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-incubating-$SKYWALKING_VERSION.tar.gz
+
+ENV SKYWALKING_ASC_URLS \
+        https://www.apache.org/dyn/closer.cgi?action=download&filename=incubator/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-incubating-$SKYWALKING_VERSION.tar.gz.asc \
+        # if the version is outdated, we might have to pull from the dist/archive :/
+	    https://www-us.apache.org/dist/incubator/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-incubating-$SKYWALKING_VERSION.tar.gz.asc \
+	    https://www.apache.org/dist/incubator/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-incubating-$SKYWALKING_VERSION.tar.gz.asc \
+	    https://archive.apache.org/dist/incubator/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-incubating-$SKYWALKING_VERSION.tar.gz.asc
+
+RUN set -eux; \
+	\
+	apk add --no-cache --virtual .fetch-deps \
+		gnupg \
+		\
+		ca-certificates \
+		openssl \
+	; \
+	\
+	export GNUPGHOME="$(mktemp -d)"; \
+	for key in $GPG_KEYS; do \
+		gpg --batch --keyserver pgp.mit.edu --recv-keys "$key"; \
+	done; \
+	\
+	success=; \
+	for url in $SKYWALKING_TGZ_URLS; do \
+		if wget -O skywalking.tar.gz "$url"; then \
+			success=1; \
+			break; \
+		fi; \
+	done; \
+	[ -n "$success" ]; \
+	\
+	echo "$SKYWALKING_SHA512 *skywalking.tar.gz" | sha512sum -c -; \
+	\
+	success=; \
+	for url in $SKYWALKING_ASC_URLS; do \
+		if wget -O skywalking.tar.gz.asc "$url"; then \
+			success=1; \
+			break; \
+		fi; \
+	done; \
+	[ -n "$success" ]; \
+	\
+	gpg --batch --verify skywalking.tar.gz.asc skywalking.tar.gz; \
+	tar -xvf skywalking.tar.gz --strip-components=1; \
+	rm -rf bin/; \
+	rm skywalking.tar.gz*; \
+	command -v gpgconf && gpgconf --kill all || :; \
+	rm -rf "$GNUPGHOME"; \
+    apk del .fetch-deps
diff --git a/6/6.0-beta/oap/Dockerfile b/6/6.0-beta/oap/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..b05a96d5f309650e85303dee9b362db72be96f2f
--- /dev/null
+++ b/6/6.0-beta/oap/Dockerfile
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM skywalking/base:6.0.0-beta
+
+LABEL maintainer="hanahmily@apache.org"
+
+ENV SKYWALKING_HOME=/skywalking \
+    JAVA_OPTS=" -Xms256M -Xmx512M"
+
+WORKDIR $SKYWALKING_HOME
+
+RUN set -eux; \
+    apk add --no-cache --virtual \
+    bash; \
+    rm -rf "config/log4j2.xml"; \
+    rm -rf "webapp"; rm -rf "agent";
+
+COPY log4j2.xml config/
+COPY docker-entrypoint.sh .
+
+EXPOSE 12800 11800
+
+ENTRYPOINT ["sh", "docker-entrypoint.sh"]
\ No newline at end of file
diff --git a/6/6.0-beta/oap/docker-entrypoint.sh b/6/6.0-beta/oap/docker-entrypoint.sh
new file mode 100644
index 0000000000000000000000000000000000000000..f3f19e0838c741f161bc4779590a80b3cc44577f
--- /dev/null
+++ b/6/6.0-beta/oap/docker-entrypoint.sh
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#!/bin/bash
+
+set -ex
+
+CLASSPATH="config:$CLASSPATH"
+for i in oap-libs/*.jar
+do
+    CLASSPATH="$i:$CLASSPATH"
+done
+
+exec java ${JAVA_OPTS} -classpath $CLASSPATH \
+ org.apache.skywalking.oap.server.starter.OAPServerStartUp "$@"
\ No newline at end of file
diff --git a/6/6.0-beta/oap/log4j2.xml b/6/6.0-beta/oap/log4j2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b1f18186374f061543a56f6ef2fbf60af9a0fc90
--- /dev/null
+++ b/6/6.0-beta/oap/log4j2.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<Configuration status="INFO">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <logger name="org.eclipse.jetty" level="INFO"/>
+        <logger name="org.apache.zookeeper" level="INFO"/>
+        <logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/>
+        <logger name="io.grpc.netty" level="INFO"/>
+        <Root level="INFO">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/6/6.0-beta/ui/Dockerfile b/6/6.0-beta/ui/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..121e40e21077086de7444565a6b54ea049fa2d46
--- /dev/null
+++ b/6/6.0-beta/ui/Dockerfile
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM skywalking/base:6.0.0-beta
+
+LABEL maintainer="hanahmily@apache.org"
+
+ENV SKYWALKING_HOME=/skywalking \
+    JAVA_OPTS=" -Xms256M -Xmx512M"
+
+WORKDIR $SKYWALKING_HOME
+
+RUN set -eux; \
+    apk add --no-cache --virtual \
+    bash; \
+    rm -rf "config"; rm -rf "oap-libs"; \
+    rm -rf "agent";
+
+COPY docker-entrypoint.sh .
+COPY logback.xml webapp/
+
+EXPOSE 8080
+
+ENTRYPOINT ["sh", "docker-entrypoint.sh"]
\ No newline at end of file
diff --git a/6/6.0-beta/ui/docker-entrypoint.sh b/6/6.0-beta/ui/docker-entrypoint.sh
new file mode 100644
index 0000000000000000000000000000000000000000..2a857b7c65a04d67350accf331f43597a704eb33
--- /dev/null
+++ b/6/6.0-beta/ui/docker-entrypoint.sh
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#!/bin/bash
+
+set -ex
+
+exec java -jar webapp/skywalking-webapp.jar --logging.config=webapp/logback.xml "$@"
\ No newline at end of file
diff --git a/6/6.0-beta/ui/logback.xml b/6/6.0-beta/ui/logback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..834036d7bf278b7c8b6015afa6bd02acc2d04d33
--- /dev/null
+++ b/6/6.0-beta/ui/logback.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml" />
+</configuration>
\ No newline at end of file