diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5855ad0..3e5edec 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,8 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install just
-        run: |
-          wget -qO- https://github.com/casey/just/releases/download/1.16.0/just-1.16.0-x86_64-unknown-linux-musl.tar.gz | tar -C /usr/local/bin/ -xzvf - just
+        uses: taiki-e/install-action@just
 
       - name: Install dependencies
         run: |
@@ -31,31 +30,31 @@ jobs:
 
       - name: Build jetson image for Jetson nano revision 300
         run: |
-          sudo just build-jetson-image  \
+          just build-jetson-image  \
             jetson-nano \
             300
-          sudo mv jetson.img "jetson-nano-300_$UBUNTU_$BSP.img"
-          sudo lrzip "jetson-nano-300_$UBUNTU_$BSP.img"
-          sudo rm -rf "jetson-nano-300_$UBUNTU_$BSP.img"
+          mv jetson.img "jetson-nano-300_$UBUNTU_$BSP.img"
+          lrzip "jetson-nano-300_$UBUNTU_$BSP.img"
+          rm -rf "jetson-nano-300_$UBUNTU_$BSP.img"
           ls -lht "jetson-nano-300_$UBUNTU_$BSP.img.lrz"
 
       - name: Build jetson image for Jetson nano revision 200
         run: |
-          sudo just build-jetson-image \
+          just build-jetson-image \
             jetson-nano \
             200
-          sudo mv jetson.img "jetson-nano-200_$UBUNTU_$BSP.img"
-          sudo lrzip "jetson-nano-200_$UBUNTU_$BSP.img"
-          sudo rm -rf "jetson-nano-200_$UBUNTU_$BSP.img"
+          mv jetson.img "jetson-nano-200_$UBUNTU_$BSP.img"
+          lrzip "jetson-nano-200_$UBUNTU_$BSP.img"
+          rm -rf "jetson-nano-200_$UBUNTU_$BSP.img"
           ls -lht "jetson-nano-200_$UBUNTU_$BSP.img.lrz"
 
       - name: Build jetson image for Jetson nano 2G
         run: |
-          sudo just build-jetson-image \
+          just build-jetson-image \
             jetson-nano-2gb
-          sudo mv jetson.img "jetson-nano-2gb_$UBUNTU_$BSP.img"
-          sudo lrzip "jetson-nano-2gb_$UBUNTU_$BSP.img"
-          sudo rm -rf "jetson-nano-2gb_$UBUNTU_$BSP.img"
+          mv jetson.img "jetson-nano-2gb_$UBUNTU_$BSP.img"
+          lrzip "jetson-nano-2gb_$UBUNTU_$BSP.img"
+          rm -rf "jetson-nano-2gb_$UBUNTU_$BSP.img"
           ls -lht "jetson-nano-2gb_$UBUNTU_$BSP.img.lrz"
 
       - name: Release
diff --git a/scripts/build-jetson-image.sh b/scripts/build-jetson-image.sh
index db84fc6..7aebb80 100755
--- a/scripts/build-jetson-image.sh
+++ b/scripts/build-jetson-image.sh
@@ -23,7 +23,7 @@ else
 	echo "Building for jetson-nano-2gb board"
 fi
 
-sudo podman build \
+sudo -E XDG_RUNTIME_DIR= podman build \
 	--cap-add=all \
 	--jobs=4 \
 	-f Containerfile.image \