diff --git a/integrations/docker/images/chip-build-ameba/Dockerfile b/integrations/docker/images/chip-build-ameba/Dockerfile
new file mode 100644
index 00000000000000..faa59e48864776
--- /dev/null
+++ b/integrations/docker/images/chip-build-ameba/Dockerfile
@@ -0,0 +1,17 @@
+ARG VERSION=latest
+FROM connectedhomeip/chip-build:${VERSION}
+
+# Setup Ameba
+ARG AMEBA_DIR=/opt/ameba
+RUN set -x \
+    && apt-get update \
+    && apt-get --no-install-recommends -y install python2 \
+    && mkdir ${AMEBA_DIR} \
+    && cd ${AMEBA_DIR} \
+    && git clone --depth 1 --progress -b cmake_build https://github.com/pankore/ambd_sdk_with_chip_non_NDA.git \
+    && cd ambd_sdk_with_chip_non_NDA \
+    && git pull \
+    && git submodule update --depth 1 --init --progress \
+    && : # last line
+
+ENV AMEBA_PATH=${AMEBA_DIR}/ambd_sdk_with_chip_non_NDA
diff --git a/integrations/docker/images/chip-build-ameba/build.sh b/integrations/docker/images/chip-build-ameba/build.sh
new file mode 120000
index 00000000000000..fcb4d4ee75d531
--- /dev/null
+++ b/integrations/docker/images/chip-build-ameba/build.sh
@@ -0,0 +1 @@
+../../build.sh
\ No newline at end of file
diff --git a/integrations/docker/images/chip-build-ameba/run.sh b/integrations/docker/images/chip-build-ameba/run.sh
new file mode 120000
index 00000000000000..ccbd3501b330d9
--- /dev/null
+++ b/integrations/docker/images/chip-build-ameba/run.sh
@@ -0,0 +1 @@
+../../run.sh
\ No newline at end of file
diff --git a/integrations/docker/images/chip-build-ameba/version b/integrations/docker/images/chip-build-ameba/version
new file mode 120000
index 00000000000000..a4280acd348e7f
--- /dev/null
+++ b/integrations/docker/images/chip-build-ameba/version
@@ -0,0 +1 @@
+../chip-build/version
\ No newline at end of file
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
index 7c11c7c7da5536..10303e107c48d3 100644
--- a/integrations/docker/images/chip-build-vscode/Dockerfile
+++ b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -8,6 +8,7 @@ FROM connectedhomeip/chip-build-telink:${VERSION} AS telink
 FROM connectedhomeip/chip-build-infineon:${VERSION} AS p6
 FROM connectedhomeip/chip-build-tizen:${VERSION} AS tizen
 FROM connectedhomeip/chip-build-crosscompile:${VERSION} AS crosscompile
+FROM connectedhomeip/chip-build-ameba:${VERSION} AS ameba
 FROM connectedhomeip/chip-build:${VERSION}
 
 # qemu-src copied over because qemu directory contains symlinks to the src
@@ -34,6 +35,8 @@ COPY --from=tizen /opt/tizen_sdk /opt/tizen_sdk
 
 COPY --from=crosscompile /opt/ubuntu-21.04-aarch64-sysroot /opt/ubuntu-21.04-aarch64-sysroot
 
+COPY --from=ameba /opt/ameba /opt/ameba
+
 # Android license file "acceping" is done by writing license hashes
 # into the 'licenses' subfolder. This allows any user (in particular
 # 'vscode' to accept licenses)
@@ -59,3 +62,4 @@ ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.13.0
 ENV CY_TOOLS_PATHS="/opt/ModusToolbox/tools_2.3"
 ENV TIZEN_HOME /opt/tizen_sdk
 ENV SYSROOT_AARCH64=/opt/ubuntu-21.04-aarch64-sysroot
+ENV AMEBA_PATH=/opt/ameba/ambd_sdk_with_chip_non_NDA
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
index 3afb327e280ccc..bca6bd0d9c4e90 100644
--- a/integrations/docker/images/chip-build/version
+++ b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.5.16
+0.5.17 Version bump reason: Add for Ameba platform