diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ee2b6c93..9875c29e 100755
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -101,12 +101,12 @@ jobs:
     steps:
     - name: Fetch sources
       uses: actions/checkout@v2
-    - name: Install nightly toolchain
+    - name: Install stable toolchain
       uses: actions-rs/toolchain@v1
       with:
         components: clippy,rustfmt
         override: "true"
-        toolchain: nightly
+        toolchain: stable
     - name: Setup cache
       uses: Swatinem/rust-cache@v1
     - id: cargo_udeps
@@ -123,7 +123,7 @@ jobs:
         mkdir -p ~/udeps
         cp $( which cargo-udeps ) ~/udeps
     - name: Run cargo-udeps
-      run: "\nexport PATH=~/udeps:$PATH  \ncargo udeps \n"
+      run: "\nexport PATH=~/udeps:$PATH\nexport RUSTC_BOOTSTRAP=1\ncargo udeps \n"
   rustfmt:
     name: rustfmt
     runs-on: ubuntu-20.04
diff --git a/ci/config.yaml b/ci/config.yaml
index 10765cfe..b41b492c 100644
--- a/ci/config.yaml
+++ b/ci/config.yaml
@@ -1,5 +1,5 @@
 dockerImages:
-  - jjs-invoker
-  - jjs-invoker-shim
-  - jjs-invoker-strace-debugger
+  - invoker
+  - invoker-shim
+  - invoker-strace-debugger
 buildTimeoutMinutes: 15
diff --git a/ci/publish-images.sh b/ci/publish-images.sh
index fcd8469c..17d2d7fa 100755
--- a/ci/publish-images.sh
+++ b/ci/publish-images.sh
@@ -15,9 +15,9 @@ else
   exit 1
 fi
 echo $GITHUB_TOKEN | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-docker tag jjs-invoker ghcr.io/jjs-dev/jjs-invoker:$TAG
-docker push ghcr.io/jjs-dev/jjs-invoker:$TAG
-docker tag jjs-invoker-shim ghcr.io/jjs-dev/jjs-invoker-shim:$TAG
-docker push ghcr.io/jjs-dev/jjs-invoker-shim:$TAG
-docker tag jjs-invoker-strace-debugger ghcr.io/jjs-dev/jjs-invoker-strace-debugger:$TAG
-docker push ghcr.io/jjs-dev/jjs-invoker-strace-debugger:$TAG
\ No newline at end of file
+docker tag invoker ghcr.io/jjs-dev/invoker:$TAG
+docker push ghcr.io/jjs-dev/invoker:$TAG
+docker tag invoker-shim ghcr.io/jjs-dev/invoker-shim:$TAG
+docker push ghcr.io/jjs-dev/invoker-shim:$TAG
+docker tag invoker-strace-debugger ghcr.io/jjs-dev/invoker-strace-debugger:$TAG
+docker push ghcr.io/jjs-dev/invoker-strace-debugger:$TAG
\ No newline at end of file
diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index 2c65cfb1..44a0359d 100644
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -1,5 +1,5 @@
 set -euxo pipefail
 
-docker build . --target invoker "--build-arg=EXTRA_ARGS=$@" --tag jjs-invoker
-docker build . --target shim "--build-arg=EXTRA_ARGS=$@" --tag jjs-invoker-shim
-docker build . --target strace-debug "--build-arg=EXTRA_ARGS=$@" --tag jjs-invoker-strace-debugger
\ No newline at end of file
+docker build . --target invoker "--build-arg=EXTRA_ARGS=$@" --tag invoker
+docker build . --target shim "--build-arg=EXTRA_ARGS=$@" --tag invoker-shim
+docker build . --target strace-debug "--build-arg=EXTRA_ARGS=$@" --tag invoker-strace-debugger