diff --git a/.github/scripts/setup.sh b/.github/scripts/setup.sh
index 544ff53..5f7a37e 100755
--- a/.github/scripts/setup.sh
+++ b/.github/scripts/setup.sh
@@ -1,6 +1,7 @@
 #! /usr/bin/env bash
 
 mv repo/home/coder/.local /home/coder/;
+cp repo/home/coder/.gitconfig /root/;
 mv repo/home/coder/.gitconfig /home/coder/;
 chmod +x /home/coder/.local/bin/*;
 chown -R coder:coder /home/coder/;
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 25de31f..88d6296 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       options: -u root
-      image: pauletaylor/devcontainers:23.06-cpp-cuda11.8-mambaforge-ubuntu22.04
+      image: rapidsai/devcontainers:23.06-cpp-cuda11.8-mambaforge-ubuntu22.04
       env:
         JOBS: 1
         CMAKE_BUILD_PARALLEL_LEVEL: 1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5bc3d84..e8b947e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       options: -u root
-      image: pauletaylor/devcontainers:23.06-cpp-cuda11.8-mambaforge-ubuntu22.04
+      image: rapidsai/devcontainers:23.06-cpp-cuda11.8-mambaforge-ubuntu22.04
       env:
         JOBS: 1
         CMAKE_BUILD_PARALLEL_LEVEL: 1
diff --git a/Dockerfile b/Dockerfile
index a40c92f..9db8583 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,6 +33,7 @@ USER coder
 WORKDIR /home/coder/.cache
 WORKDIR /home/coder
 
+COPY --chown=root:root home/coder/.gitconfig /root/
 COPY --chown=coder:coder home/coder/.gitconfig /home/coder/
 COPY --chown=coder:coder home/coder/.local/bin/* /home/coder/.local/bin/
 
diff --git a/home/coder/.local/bin/build-all b/home/coder/.local/bin/build-all
index 37abf5e..087777b 100755
--- a/home/coder/.local/bin/build-all
+++ b/home/coder/.local/bin/build-all
@@ -5,6 +5,8 @@ build_all() {
 
     cd ~/;
 
+    sccache --stop-server 2>/dev/null || SCCACHE_NO_DAEMON=1 sccache --show-stats;
+
     # clone-legion;
     clone-legate-core;
     clone-cunumeric;
diff --git a/home/coder/.local/bin/build-cunumeric-cpp b/home/coder/.local/bin/build-cunumeric-cpp
index ca29447..43334d0 100755
--- a/home/coder/.local/bin/build-cunumeric-cpp
+++ b/home/coder/.local/bin/build-cunumeric-cpp
@@ -3,6 +3,8 @@
 build_cunumeric_cpp() {
     set -ex;
 
+    sccache --stop-server 2>/dev/null || SCCACHE_NO_DAEMON=1 sccache --show-stats;
+
     # Build + package cuNumeric C++ libs
     local cmake_args=(${CMAKE_ARGS:-});
     cmake_args+=(-DBUILD_SHARED_LIBS=ON);
@@ -15,11 +17,11 @@ build_cunumeric_cpp() {
 
     cmake -S ~/cunumeric -B ~/cunumeric/build ${cmake_args[@]} -GNinja;
 
-    sccache --show-stats;
+    sccache --stop-server 2>/dev/null || SCCACHE_NO_DAEMON=1 sccache --show-stats;
 
     time cmake --build ~/cunumeric/build --verbose --parallel ${JOBS:-$(nproc --ignore=1)};
 
-    sccache --show-stats;
+    sccache --stop-server 2>/dev/null || SCCACHE_NO_DAEMON=1 sccache --show-stats;
 
     (
     mkdir -p /tmp/out;
diff --git a/home/coder/.local/bin/build-legate-cpp b/home/coder/.local/bin/build-legate-cpp
index cdcb62f..c2aa330 100755
--- a/home/coder/.local/bin/build-legate-cpp
+++ b/home/coder/.local/bin/build-legate-cpp
@@ -3,6 +3,8 @@
 build_legate_cpp() {
     set -ex;
 
+    sccache --stop-server 2>/dev/null || SCCACHE_NO_DAEMON=1 sccache --show-stats;
+
     # Build + package legate.core C++ libs
     local cmake_args=(${CMAKE_ARGS:-});
     cmake_args+=(-DBUILD_SHARED_LIBS=ON);
@@ -34,11 +36,11 @@ build_legate_cpp() {
         's/= unknown/= unknown + ["--prefix", args.prefix]/' \
         ~/legate/build/_deps/legion-src/bindings/python/setup.py;
 
-    sccache --show-stats;
+    sccache --stop-server 2>/dev/null || SCCACHE_NO_DAEMON=1 sccache --show-stats;
 
     time cmake --build ~/legate/build --verbose --parallel ${JOBS:-$(nproc --ignore=1)};
 
-    sccache --show-stats;
+    sccache --stop-server 2>/dev/null || SCCACHE_NO_DAEMON=1 sccache --show-stats;
 
     (
     mkdir -p /tmp/out;