diff --git a/Dockerfile b/Dockerfile
index 24d332c1..8d77fc67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,16 @@
 FROM quay.io/opendatahub/text-generation-inference:fast-836fa5f
 
+USER root
+
 WORKDIR /caikit
 COPY caikit /caikit
 
-RUN yum -y install git && \
+RUN yum -y install git && yum clean all && \
     pip install pipenv && \
     pipenv install --system && \
+    rm -rf ~/.cache && \
     mkdir -p /opt/models && \
-    adduser -g 0 -u 1001 caikit && \
+    adduser -g 0 -u 1001 caikit --home-dir /caikit && \
     chown -R 1001:0 /caikit /opt/models && \
     chmod -R g=u /caikit /opt/models
 
diff --git a/docs/caikit-servingruntime.yaml b/docs/caikit-servingruntime.yaml
index 3592048e..b3bddba2 100644
--- a/docs/caikit-servingruntime.yaml
+++ b/docs/caikit-servingruntime.yaml
@@ -8,7 +8,7 @@ spec:
     - name: RUNTIME_LOCAL_MODELS_DIR
       value: /mnt/models
     # TODO: This will eventually point to the official image
-    image: quay.io/spryor/caikit-serving@sha256:6c5358edc460436880d87fa40f76e1fdeb5a0410d87824c0eb8965cfde641c0d
+    image: quay.io/opendatahub/caikit-tgis-serving@sha256:20cbc7b312e0dc63903d4a2c7d70b741135ffea31113af63dd8691da4baae0f9
     name: kserve-container
     ports:
     # Note, KServe only allows a single port, this is the gRPC port. Subject to change in the future