diff --git a/build-setup.sh b/build-setup.sh
index b899d56..ca51041 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -48,7 +48,7 @@
 
 ${PROXY}
 
-RUN dnf --refresh upgrade -y && dnf install -y \
+RUN dnf --refresh install -y \
 	bzip2 \
 	chrpath \
 	cpio \
@@ -91,7 +91,7 @@
 ${PROXY}
 
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get upgrade -yy && apt-get install -yy \
+RUN apt-get update && apt-get install -yy \
 	build-essential \
 	chrpath \
 	debianutils \
diff --git a/initramfs-build.sh b/initramfs-build.sh
index 5ef7e63..3c08807 100755
--- a/initramfs-build.sh
+++ b/initramfs-build.sh
@@ -24,7 +24,7 @@
 ${PROXY}
 
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get upgrade -yy && apt-get install -yy \
+RUN apt-get update && apt-get install -yy \
 	bc \
 	build-essential \
 	cpio \
diff --git a/kernel-build-setup.sh b/kernel-build-setup.sh
index c17c119..89c2d2f 100755
--- a/kernel-build-setup.sh
+++ b/kernel-build-setup.sh
@@ -29,7 +29,7 @@
 
 ${PROXY}
 
-RUN dnf --refresh upgrade -y && dnf install -y \
+RUN dnf --refresh install -y \
 	bc \
 	findutils \
 	git \
@@ -59,7 +59,7 @@
 ${PROXY}
 
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get upgrade -yy && apt-get install -yy \
+RUN apt-get update && apt-get install -yy \
 	bc \
 	build-essential \
 	git \
diff --git a/kernel-build.sh b/kernel-build.sh
index 141d490..d1a52f2 100755
--- a/kernel-build.sh
+++ b/kernel-build.sh
@@ -24,7 +24,7 @@
 ${PROXY}
 
 ENV DEBIAN_FRONTEND noninteractive 
-RUN apt-get update && apt-get upgrade -yy && apt-get install -yy \
+RUN apt-get update && apt-get install -yy \
 	bc \
 	build-essential \
 	git \
diff --git a/openpower-build-setup.sh b/openpower-build-setup.sh
index 47dfa32..774cc53 100755
--- a/openpower-build-setup.sh
+++ b/openpower-build-setup.sh
@@ -25,18 +25,39 @@
   Dockerfile=$(cat << EOF
 FROM fedora:latest
 
-RUN dnf --refresh upgrade -y && dnf install -y \
-	vim \
-	gcc-c++ \
-	flex \
+RUN dnf --refresh repolist && dnf install -y \
+	bc \
 	bison \
-	git \
-	ctags \
+	bzip2 \
+	cpio \
   	cscope \
+	ctags \
 	expat-devel \
+	findutils \
+	flex \
+	gcc-c++ \
+	git \
+	libxml2-devel \
+	ncurses-devel \
 	patch \
+	perl \
+	perl-bignum \
+	"perl(Digest::SHA1)" \
+	perl(Env)" \
+	"perl(Fatal)" \
+	"perl(Thread::Queue)" \
+	"perl(XML::SAX)" \
+	"perl(XML::Simple)" \
+	"perl(YAML)" \
+	"perl(XML::LibXML)" \
+	python \
+	tar \
+	unzip \
+	vim \
+	wget \
+	which \
 	zlib-devel \
-	zlib-static perl
+	zlib-static
 
 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}
@@ -53,7 +74,7 @@
 FROM ubuntu:15.10
 
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get upgrade -yy && apt-get install -yy \
+RUN apt-get update && apt-get install -yy \
 	bc \
 	bison \
 	build-essential \