diff --git a/.github/workflows/docker_packaging_jobs.yml b/.github/workflows/docker_packaging_jobs.yml
index 55a1962e1..44ac5e6b3 100644
--- a/.github/workflows/docker_packaging_jobs.yml
+++ b/.github/workflows/docker_packaging_jobs.yml
@@ -3,7 +3,7 @@ on:
   workflow_call:
     inputs:
       dockerTag:
-        description: 'docker tag to push to'
+        description: 'tag to assign docker images'
         type: string
 permissions:
   contents: read
@@ -16,9 +16,6 @@ jobs:
     name: Build ${{ matrix.DOCKER_ARCH }}
     runs-on:
       - ${{ matrix.run-on }}
-    # The default timeout of 60 minutes is a little low for compiling
-    # cryptography on ARM architectures.
-    timeout-minutes: 180
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/snap_packaging_jobs.yml b/.github/workflows/snap_packaging_jobs.yml
index 523cba884..49152e3d0 100644
--- a/.github/workflows/snap_packaging_jobs.yml
+++ b/.github/workflows/snap_packaging_jobs.yml
@@ -3,7 +3,7 @@ on:
   workflow_call:
     inputs:
       snapBuildTimeout:
-        description: 'timeout for snap builds'
+        description: 'timeout for snap builds in seconds'
         type: number
 permissions:
   contents: read
@@ -98,8 +98,8 @@ jobs:
       env:
         LAUNCHPAD_CREDS: "${{ secrets.LAUNCHPAD_CREDENTIALS }}"
       run: |-
-        git config --global user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
-        git config --global user.name "${{ github.actor }}"
+        git config --global user.email "github-actions[bot]"
+        git config --global user.name ""41898282+github-actions[bot]@users.noreply.github.com"
         mkdir -p ~/.local/share/snapcraft/
         echo "$LAUNCHPAD_CREDS" > ~/.local/share/snapcraft/launchpad-credentials
         python3 tools/snap/build_remote.py ALL --archs "$SNAP_ARCH" --timeout ${{ env.snapBuildTimeout }}