diff --git a/build-setup.sh b/build-setup.sh
index b3b9b48..2ba439c 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -103,6 +103,7 @@
 	perl-Data-Dumper \
 	perl-Thread-Queue \
 	python-devel \
+	python3-devel \
 	SDL-devel \
 	socat \
 	subversion \
@@ -142,6 +143,7 @@
 	libsdl1.2-dev \
 	libthread-queue-any-perl \
 	python \
+	python3 \
 	socat \
 	subversion \
 	texinfo \
diff --git a/build-unit-test-docker.sh b/build-unit-test-docker.sh
index 69985e7..cc1d887 100755
--- a/build-unit-test-docker.sh
+++ b/build-unit-test-docker.sh
@@ -52,6 +52,11 @@
     python-yaml \
     python-mako \
     python-setuptools \
+    python3 \
+    python3-dev\
+    python3-yaml \
+    python3-mako \
+    python3-setuptools \
     pkg-config \
     autoconf \
     libsystemd-dev \
diff --git a/openpower-build-setup.sh b/openpower-build-setup.sh
index 6062389..fa79635 100755
--- a/openpower-build-setup.sh
+++ b/openpower-build-setup.sh
@@ -73,6 +73,7 @@
 	"perl(YAML)" \
 	"perl(XML::LibXML)" \
 	python \
+	python3 \
 	tar \
 	unzip \
 	vim \
@@ -114,6 +115,7 @@
 	libxml2-utils \
 	language-pack-en \
 	python \
+	python3 \
 	texinfo \
 	unzip \
 	vim-common \
diff --git a/qemu-build.sh b/qemu-build.sh
index a80d4e7..044632b 100755
--- a/qemu-build.sh
+++ b/qemu-build.sh
@@ -28,7 +28,7 @@
 	libpixman-1-dev \
 	libglib2.0-dev \
 	libfdt-dev \
-	make python-yaml gcc libc6-dev
+	make python-yaml python3-yaml gcc libc6-dev
 
 RUN grep -q ${GROUPS} /etc/group || groupadd -g ${GROUPS} ${USER}
 RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
diff --git a/scripts/build-qemu-robot-docker.sh b/scripts/build-qemu-robot-docker.sh
index cd69aec..950a11c 100755
--- a/scripts/build-qemu-robot-docker.sh
+++ b/scripts/build-qemu-robot-docker.sh
@@ -31,6 +31,9 @@
     python \
     python-dev \
     python-setuptools \
+    python3 \
+    python3-dev \
+    python3-setuptools \
     socat \
     texinfo \
     wget \