diff --git a/.github/workflows/build-citus-community-nightlies.yml b/.github/workflows/build-citus-community-nightlies.yml
index 5ec9e9e1..0e63b5d8 100644
--- a/.github/workflows/build-citus-community-nightlies.yml
+++ b/.github/workflows/build-citus-community-nightlies.yml
@@ -23,7 +23,6 @@ jobs:
       matrix:
         platform:
           - el/8
-          - debian/bullseye
           - debian/bookworm
           - debian/trixie
           - ubuntu/noble
@@ -52,7 +51,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Clone tools branch
-        run: git clone -b v0.8.39 --depth=1  https://github.com/citusdata/tools.git tools
+        run: git clone -b v0.8.40 --depth=1  https://github.com/citusdata/tools.git tools
 
       - name: Install package dependencies
         run: |
diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
index 926f9af2..adfad624 100644
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@@ -26,7 +26,6 @@ jobs:
           - el/9
           - ol/8
           - ol/9
-          - debian/bullseye
           - debian/bookworm
           - debian/trixie
           - ubuntu/noble
@@ -61,7 +60,7 @@ jobs:
           echo "GITHUB_TOKEN=${{ steps.app-token.outputs.token }}" >> $GITHUB_ENV
 
       - name: Clone tools branch
-        run: git clone -b v0.8.36 --depth=1  https://github.com/citusdata/tools.git tools
+        run: git clone -b v0.8.40 --depth=1  https://github.com/citusdata/tools.git tools
 
       - name: Install package dependencies
         run: |
@@ -95,7 +94,7 @@ jobs:
 
       - name: Build arm64 debsigner image
         if: matrix.arch == 'arm64'
-        run: docker build -t citusdata/packaging:debsigner -f tooling/dockerfiles/debsigner/Dockerfile tooling
+        run: docker build -t citusdata/packaging:debsigner tooling/dockerfiles/debsigner
 
       - name: Build packages
         run: |
diff --git a/.github/workflows/update_package_properties.yml b/.github/workflows/update_package_properties.yml
index 986590f0..6b2bd4c5 100644
--- a/.github/workflows/update_package_properties.yml
+++ b/.github/workflows/update_package_properties.yml
@@ -50,7 +50,7 @@ jobs:
           sudo apt-get install -y libcurl4-openssl-dev libssl-dev python3-testresources
 
       - name: Clone tools branch
-        run: git clone -b v0.8.36 --depth=1  https://github.com/citusdata/tools.git tools
+        run: git clone -b v0.8.40 --depth=1  https://github.com/citusdata/tools.git tools
 
       - name: Set git name and email
         run: |