diff --git a/test/release/docker/ubuntu18.04/Dockerfile b/test/release/docker/ubuntu18.04/Dockerfile
index cb3ce2cf..a23cca21 100644
--- a/test/release/docker/ubuntu18.04/Dockerfile
+++ b/test/release/docker/ubuntu18.04/Dockerfile
@@ -40,11 +40,11 @@ RUN fpm -s empty \
 
 
 ARG WORKFLOW=nvidia-docker
-ARG TEST_REPO=nvidia.github.io
 RUN curl -s -L https://nvidia.github.io/${WORKFLOW}/gpgkey | apt-key add - \
    && curl -s -L https://nvidia.github.io/${WORKFLOW}/ubuntu18.04/nvidia-docker.list | tee /etc/apt/sources.list.d/nvidia-docker.list \
    && apt-get update
 
 COPY entrypoint.sh /
+COPY install_repo.sh /
 
 ENTRYPOINT [ "/entrypoint.sh" ]
\ No newline at end of file
diff --git a/test/release/docker/ubuntu18.04/entrypoint.sh b/test/release/docker/ubuntu18.04/entrypoint.sh
index 580498a0..c8954404 100755
--- a/test/release/docker/ubuntu18.04/entrypoint.sh
+++ b/test/release/docker/ubuntu18.04/entrypoint.sh
@@ -24,12 +24,11 @@ if [[ -d ${LOCAL_REPO_DIRECTORY} ]]; then
     echo "Setting up local-repository"
     echo "deb [trusted=yes] file:/local-repository ./" > /etc/apt/sources.list.d/local.list
     $(cd /local-repository && apt-ftparchive packages . > Packages)
-    apt-get update
+elif [[ -n ${TEST_REPO} ]]; then
+    ./install_repo.sh ${TEST_REPO}
 else
-    echo "Setting up TEST repo: ${TEST_REPO}"
-    sed -i -e 's#nvidia\.github\.io/libnvidia-container#${TEST_REPO}/libnvidia-container#g' /etc/apt/sources.list.d/nvidia-docker.list
-    sed -i -e '/experimental/ s/^#//g' /etc/apt/sources.list.d/nvidia-docker.list
-    apt-get update
+    echo "Skipping repo setup"
 fi
+apt-get update
 
 exec bash $@
diff --git a/test/release/docker/ubuntu18.04/install_repo.sh b/test/release/docker/ubuntu18.04/install_repo.sh
new file mode 100755
index 00000000..a6c0d156
--- /dev/null
+++ b/test/release/docker/ubuntu18.04/install_repo.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021, NVIDIA CORPORATION.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script is used to build the packages for the components of the NVIDIA
+# Container Stack. These include the nvidia-container-toolkit in this repository
+# as well as the components included in the third_party folder.
+# All required packages are generated in the specified dist folder.
+
+test_repo=$1
+echo "Setting up TEST repo: ${test_repo}"
+sed -i -e "s#nvidia\.github\.io/libnvidia-container#${test_repo}/libnvidia-container#g" /etc/apt/sources.list.d/nvidia-docker.list
+sed -i -e '/experimental/ s/^#//g' /etc/apt/sources.list.d/nvidia-docker.list