diff --git a/images/static-images/aarch64/oraclelinux/4.14/Dockerfile b/images/static-images/aarch64/oraclelinux/4.14/Dockerfile
index 1889c57..253eeb0 100644
--- a/images/static-images/aarch64/oraclelinux/4.14/Dockerfile
+++ b/images/static-images/aarch64/oraclelinux/4.14/Dockerfile
@@ -7,23 +7,25 @@ COPY /dev.repo /etc/yum.repos.d/
 
 RUN yum groupinstall -y 'Development Tools' && \
 	yum install -y \
-		binutils-devel \
-		elfutils-libelf-devel \
-		gcc \
-		git \
-		iproute \
-		kmod \
-		libcap-devel \
-		make \
-		openssh-server \
-		rsync \
-		systemd \
-		tar && \
+                binutils-devel \
+                elfutils-libelf-devel \
+                git \
+                iproute \
+                kmod \
+                libcap-devel \
+                make \
+                openssh-server \
+                oracle-softwarecollection-release-el7 \
+                rsync \
+                systemd \
+                tar && \
+	yum install -y oracle-armtoolset-1 && \
 	curl -L -o kernel.rpm  ${URL}/getPackage/kernel-uek-${VERSION}.el7uek.aarch64.rpm && \
 	curl -L -o devel.rpm   ${URL}/getPackage/kernel-uek-devel-${VERSION}.el7uek.aarch64.rpm && \
 	curl -Lo libdtrace-devel.rpm ${URL}/getPackage/libdtrace-ctf-devel-1.1.0-2.el7.aarch64.rpm && \
 	curl -Lo libdtrace.rpm ${URL}/getPackage/libdtrace-ctf-1.1.0-2.el7.aarch64.rpm && \
 	yum install -y --skip-broken ./kernel.rpm ./devel.rpm ./libdtrace.rpm ./libdtrace-devel.rpm && \
+	echo 'source /opt/oracle/oracle-armtoolset-1/enable' >> /root/.bashrc && \
 	sed -i -e 's/^AcceptEnv LANG LC_\*$/#AcceptEnv LANG LC_*/' /etc/ssh/sshd_config && \
 	echo "root:root" | chpasswd && \
 	echo 'UseDNS no' >> /etc/ssh/sshd_config && \
@@ -34,9 +36,5 @@ RUN yum groupinstall -y 'Development Tools' && \
 	ln -sf /opt/cmake-3.19.8/bin/* /usr/bin/ && \
 	mkdir -p /lib/modules/${VERSION}.el7uek.aarch64/ && \
 	ln -s /usr/src/kernels/${VERSION}.el7uek.aarch64/ /lib/modules/${VERSION}.el7uek.aarch64/build && \
-	mkdir -p /opt/oracle/oracle-armtoolset-1/root/bin/ && \
-	ln -s /usr/bin/gcc     /opt/oracle/oracle-armtoolset-1/root/bin/gcc && \
-	ln -s /usr/bin/ld      /opt/oracle/oracle-armtoolset-1/root/bin/ld  && \
-	ln -s /usr/bin/nm      /opt/oracle/oracle-armtoolset-1/root/bin/nm  && \
-	ln -s /usr/bin/objdump /opt/oracle/oracle-armtoolset-1/root/bin/objdump && \
-	ln -s /usr/bin/objcopy /opt/oracle/oracle-armtoolset-1/root/bin/objcopy
+	yum clean all && \
+	rm -rf /var/cache/yum