diff --git a/ci/Dockerfile/fedora32.ppc64le b/ci/Dockerfile/fedora32.ppc64le
deleted file mode 120000
index 077cd0b..0000000
--- a/ci/Dockerfile/fedora32.ppc64le
+++ /dev/null
@@ -1 +0,0 @@
-fedora32
\ No newline at end of file
diff --git a/ci/Dockerfile/fedora32.x86_64 b/ci/Dockerfile/fedora32.x86_64
deleted file mode 120000
index 077cd0b..0000000
--- a/ci/Dockerfile/fedora32.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-fedora32
\ No newline at end of file
diff --git a/ci/Dockerfile/fedora32 b/ci/Dockerfile/fedora33
similarity index 96%
rename from ci/Dockerfile/fedora32
rename to ci/Dockerfile/fedora33
index 8074b38..253c3f3 100644
--- a/ci/Dockerfile/fedora32
+++ b/ci/Dockerfile/fedora33
@@ -1,4 +1,4 @@
-FROM fedora:32
+FROM fedora:33
 RUN dnf -y install gcc-c++ flex bison git ctags cscope expat-devel patch \
           zlib-devel zlib-static texinfo "perl(bigint)" "perl(XML::Simple)" \
           "perl(YAML)" "perl(XML::SAX)" "perl(Fatal)" "perl(Thread::Queue)" \
diff --git a/ci/Dockerfile/fedora33.ppc64le b/ci/Dockerfile/fedora33.ppc64le
new file mode 120000
index 0000000..1726254
--- /dev/null
+++ b/ci/Dockerfile/fedora33.ppc64le
@@ -0,0 +1 @@
+fedora33
\ No newline at end of file
diff --git a/ci/Dockerfile/fedora33.x86_64 b/ci/Dockerfile/fedora33.x86_64
new file mode 120000
index 0000000..1726254
--- /dev/null
+++ b/ci/Dockerfile/fedora33.x86_64
@@ -0,0 +1 @@
+fedora33
\ No newline at end of file
diff --git a/openpower/package/ppe42-gcc/ppe42-gcc.mk b/openpower/package/ppe42-gcc/ppe42-gcc.mk
index 8aa73ce..c6711a3 100644
--- a/openpower/package/ppe42-gcc/ppe42-gcc.mk
+++ b/openpower/package/ppe42-gcc/ppe42-gcc.mk
@@ -26,6 +26,8 @@
                     --with-gnu-ld \
                     --with-gmp=$(HOST_DIR)/usr \
                     --with-mpfr=$(HOST_DIR)/usr \
+                    --with-sysroot=$(STAGING_DIR) \
+                    --with-build-time-tools=$(PPE42_TOOLCHAIN_BIN)/bin \
                     && \
         $(MAKE) configure-host && \
         $(MAKE) CFLAGS=-Wno-error all-gcc
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index 2f6d5b4..78120f1 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -14,8 +14,8 @@
 SBE_INSTALL_TARGET = NO
 
 define SBE_BUILD_CMDS
-	SBE_COMMIT_ID=$(SBE_VERSION) $(MAKE) -C $(@D) \
-		LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib \
+	SBE_COMMIT_ID=$(SBE_VERSION) $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \
+                LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib \
 		CROSS_COMPILER_PATH=$(PPE42_GCC_BIN) \
 		all
 endef