diff --git a/modules/network/dhcp-1/dhcp-1.Dockerfile b/modules/network/dhcp-1/dhcp-1.Dockerfile
index 8fc2d0630..e50ed9a95 100644
--- a/modules/network/dhcp-1/dhcp-1.Dockerfile
+++ b/modules/network/dhcp-1/dhcp-1.Dockerfile
@@ -24,9 +24,6 @@ RUN apt-get update --fix-missing
 # Install all necessary packages
 RUN apt-get install -y wget
 
-# Update the oui.txt file from ieee
-RUN wget http://standards-oui.ieee.org/oui.txt -P /usr/local/etc/
-
 # Install dhcp server
 RUN apt-get install -y isc-dhcp-server radvd systemd
 
diff --git a/modules/network/dhcp-2/dhcp-2.Dockerfile b/modules/network/dhcp-2/dhcp-2.Dockerfile
index 58256813f..66ea857c3 100644
--- a/modules/network/dhcp-2/dhcp-2.Dockerfile
+++ b/modules/network/dhcp-2/dhcp-2.Dockerfile
@@ -18,15 +18,12 @@ FROM test-run/base:latest
 ARG MODULE_NAME=dhcp-2
 ARG MODULE_DIR=modules/network/$MODULE_NAME
 
-#Update and get all additional requirements not contained in the base image
+# Update and get all additional requirements not contained in the base image
 RUN apt-get update --fix-missing
 
 # Install all necessary packages
 RUN apt-get install -y wget
 
-# Update the oui.txt file from ieee
-RUN wget http://standards-oui.ieee.org/oui.txt -P /usr/local/etc/
-
 # Install dhcp server
 RUN apt-get install -y isc-dhcp-server radvd systemd
 
diff --git a/modules/test/base/base.Dockerfile b/modules/test/base/base.Dockerfile
index 340d0e983..878273055 100644
--- a/modules/test/base/base.Dockerfile
+++ b/modules/test/base/base.Dockerfile
@@ -22,7 +22,7 @@ ARG COMMON_DIR=framework/python/src/common
 RUN apt-get update
 
 # Install common software
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq net-tools iputils-ping tzdata tcpdump iproute2 jq python3 python3-pip dos2unix nmap --fix-missing
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq net-tools iputils-ping tzdata tcpdump iproute2 jq python3 python3-pip dos2unix nmap wget --fix-missing
 
 # Install common python modules
 COPY $COMMON_DIR/ /testrun/python/src/common
@@ -50,5 +50,8 @@ ARG CONTAINER_PROTO_DIR=testrun/python/src/grpc_server/proto
 COPY $NET_MODULE_DIR/dhcp-1/$NET_MODULE_PROTO_DIR $CONTAINER_PROTO_DIR/dhcp1/
 COPY $NET_MODULE_DIR/dhcp-2/$NET_MODULE_PROTO_DIR $CONTAINER_PROTO_DIR/dhcp2/
 
+# Update the oui.txt file from ieee
+RUN wget https://standards-oui.ieee.org/oui/oui.txt -P /usr/local/etc/
+
 # Start the test module
 ENTRYPOINT [ "/testrun/bin/start" ]
\ No newline at end of file
diff --git a/modules/test/conn/conn.Dockerfile b/modules/test/conn/conn.Dockerfile
index af1921d69..a9f523e44 100644
--- a/modules/test/conn/conn.Dockerfile
+++ b/modules/test/conn/conn.Dockerfile
@@ -23,13 +23,10 @@ ARG GRPC_PROTO_FILE="grpc.proto"
 # Install all necessary packages
 RUN apt-get install -y wget
 
-# Update the oui.txt file from ieee
-RUN wget http://standards-oui.ieee.org/oui.txt -P /usr/local/etc/
-
-#Load the requirements file
+# Load the requirements file
 COPY $MODULE_DIR/python/requirements.txt /testrun/python
 
-#Install all python requirements for the module
+# Install all python requirements for the module
 RUN pip3 install -r /testrun/python/requirements.txt
 
 # Copy over all configuration files