diff --git a/Dockerfile b/Dockerfile
index b1039cd..00e18d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -480,10 +480,11 @@ RUN \
     echo
 
 # Setup dind
-# Mostly taken from https://github.com/docker-library/docker/blob/master/20.10/dind/Dockerfile
+# Ref: 
+#   - https://github.com/docker-library/docker/blob/master/20.10/dind/Dockerfile
+#   - https://docs.nvidia.com/ai-enterprise/deployment-guide/dg-docker.html
 ARG DOCKER_VERSION=20.10.18
 ARG DOCKER_COMPOSE_VERSION=v2.11.2
-ARG DIND_COMMIT=42b1175eda071c0e9121e1d64345928384a93df1
 RUN \
     echo "**** Fetch Docker static binary package ****" \
         && cd /tmp \
@@ -498,10 +499,18 @@ RUN \
             --directory /usr/local/bin/ \
             --no-same-owner \
     && \
-    echo "**** Install dind hack ****" \
+    echo "**** Install docker-compose ****" \
         && wget -O /usr/local/bin/docker-compose "https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Linux-x86_64" \
         && chmod +x /usr/local/bin/docker-compose \
     && \
+    echo "**** Install nvidia runtime ****" \
+        && distribution=$(. /etc/os-release;echo $ID$VERSION_ID) \
+        && curl -s -L https://nvidia.github.io/nvidia-docker/gpgkey | apt-key add - \
+        && curl -s -L https://nvidia.github.io/nvidia-docker/$distribution/nvidia-docker.list | tee /etc/apt/sources.list.d/nvidia-docker.list \
+        && apt-get update \
+        && apt-get install -y \
+            nvidia-container-toolkit \
+    && \
     echo "**** Section cleanup ****" \
         && apt-get clean autoclean -y \
         && apt-get autoremove -y \
diff --git a/overlay/etc/docker/daemon.json b/overlay/etc/docker/daemon.json
new file mode 100644
index 0000000..c27da79
--- /dev/null
+++ b/overlay/etc/docker/daemon.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "nvidia": {
+            "path": "/usr/bin/nvidia-container-runtime",
+            "runtimeArgs": []
+        }
+    }
+}
\ No newline at end of file