diff --git a/ci/devel-jetson-nano.Dockerfile b/ci/devel-jetson-nano.Dockerfile
index f5bec673d1..60135ae2aa 100644
--- a/ci/devel-jetson-nano.Dockerfile
+++ b/ci/devel-jetson-nano.Dockerfile
@@ -1,5 +1,6 @@
 # Special docker image for Jetson nano
-FROM nvcr.io/nvidia/deepstream-l4t:5.1-21.02-base
+#FROM nvcr.io/nvidia/deepstream-l4t:5.1-21.02-base
+FROM nvcr.io/nvidia/deepstream-l4t:6.1-base
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update -y && apt-get install -y \
@@ -15,6 +16,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     zip \
     g++ \
     gcc-7 g++-7 \
+    cmake \
     zlib1g-dev \
     protobuf-compiler \
     libprotobuf-dev \
@@ -63,10 +65,10 @@ RUN chmod +x ./cmake-install.sh
 RUN ./cmake-install.sh --prefix=/usr/local --skip-license
 
 # ubuntu GTEST ugly packaging
-WORKDIR /usr/src/gtest
+WORKDIR /usr/src/gtest/
 RUN cmake .
 RUN make -j8
-RUN make install
+RUN cp lib/libgtest* /usr/lib/
 
 # NOTE(sileht): docker nvidia on jetson is bugged with non-root account, we
 # have to configure the device access manually. The UID and GID must be the
diff --git a/ci/deviceQuery b/ci/deviceQuery
index d70001a2b3..dfed2ca9a4 100755
Binary files a/ci/deviceQuery and b/ci/deviceQuery differ