diff --git a/Dockerfile b/Dockerfile
index ad5a2ba9c..77e9b0151 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -265,6 +265,7 @@ FROM frigate AS frigate-tensorrt
 #Disable S6 Global timeout
 ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
 
+ENV TRT_VER=8.6.1
 ENV YOLO_MODELS="yolov7-tiny-416"
 
 COPY --from=trt-deps /usr/local/lib/libyolo_layer.so /usr/local/lib/libyolo_layer.so
diff --git a/docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/run b/docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/run
index 724924f2a..602315a93 100755
--- a/docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/run
+++ b/docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/run
@@ -4,7 +4,8 @@
 
 set -o errexit -o nounset -o pipefail
 
-OUTPUT_FOLDER=${OUTPUT_FOLDER:-"/config/model_cache/tensorrt"}
+MODEL_CACHE_DIR=${MODEL_CACHE_DIR:-"/config/model_cache/tensorrt"}
+OUTPUT_FOLDER="${MODEL_CACHE_DIR}/${TRT_VER}"
 
 # Create output folder
 mkdir -p ${OUTPUT_FOLDER}
@@ -14,6 +15,9 @@ MODEL_CONVERT=""
 
 for model in ${YOLO_MODELS//,/ }
 do
+    # Remove old link in case path/version changed
+    rm -f ${MODEL_CACHE_DIR}/${model}.trt
+    
     if [[ ! -f ${OUTPUT_FOLDER}/${model}.trt ]]; then
         if [[ ${FIRST_MODEL} = true ]]; then
             MODEL_CONVERT="${model}"
@@ -21,6 +25,8 @@ do
         else
             MODEL_CONVERT+=",${model}";
         fi
+    else
+        ln -s ${OUTPUT_FOLDER}/${model}.trt ${MODEL_CACHE_DIR}/${model}.trt
     fi
 done
 
@@ -42,4 +48,5 @@ do
     python3 yolo_to_onnx.py -m ${model}
     python3 onnx_to_tensorrt.py -m ${model}
     cp ${model}.trt ${OUTPUT_FOLDER}/${model}.trt
+    ln -s ${OUTPUT_FOLDER}/${model}.trt ${MODEL_CACHE_DIR}/${model}.trt
 done