diff --git a/Jenkinsfile b/Jenkinsfile
index 12c9755103..ce6fbc2e9e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -371,7 +371,7 @@ parallel hcc_ctu:
   {
     String hcc_ver = 'hcc-ctu'
     String from_image = 'compute-artifactory:5001/radeonopencompute/hcc/clang_tot_upgrade/hcc-lc-ubuntu-16.04:latest'
-    String inside_args = '--device=/dev/kfd'
+    String inside_args = '--device=/dev/kfd --device=/dev/dri'
 
     // Checkout source code, dependencies and version files
     String source_hip_rel = checkout_and_version( hcc_ver )
@@ -411,8 +411,8 @@ hcc_1_6:
   node('docker && rocm')
   {
     String hcc_ver = 'hcc-1.6'
-    String from_image = 'compute-artifactory:5001/radeonopencompute/hcc/roc-1.6.x/hcc-lc-ubuntu-16.04:latest'
-    String inside_args = '--device=/dev/kfd'
+    String from_image = 'rocm/dev-ubuntu-16.04:latest'
+    String inside_args = '--device=/dev/kfd --device=/dev/dri'
 
     // Checkout source code, dependencies and version files
     String source_hip_rel = checkout_and_version( hcc_ver )
diff --git a/docker/dockerfile-build-ubuntu-16.04 b/docker/dockerfile-build-ubuntu-16.04
index 031bf72437..8f655f7c78 100644
--- a/docker/dockerfile-build-ubuntu-16.04
+++ b/docker/dockerfile-build-ubuntu-16.04
@@ -7,6 +7,7 @@ MAINTAINER Kent Knox <kent.knox@amd>
 ARG user_uid
 
 # Install Packages
+# python and libnuma1 are dependencies of rocm_agent_enumerator
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     sudo \
     build-essential \
@@ -14,6 +15,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     git \
     libelf-dev \
     rpm \
+    python \
+    libnuma1 \
     && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*