diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b62fb0a955d..e323444261b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -565,11 +565,11 @@ jobs:
           path: |
             target/${{ matrix.target }}/release/rustup-init
           retention-days: 7
-      - name: Acquire the AWS tooling
+      - name: Ensure we have installed awscli
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
         run: |
-          pip3 install -U setuptools
-          pip3 install awscli
+          which aws
+          aws --version
       - name: Prepare the dist
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
         run: |
@@ -714,11 +714,11 @@ jobs:
           path: |
             target/${{ matrix.target }}/release/rustup-init
           retention-days: 7
-      - name: Acquire the AWS tooling
+      - name: Ensure we have installed awscli
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
         run: |
-          pip3 install -U setuptools
-          pip3 install awscli
+          which aws
+          aws --version
       - name: Prepare the dist
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
         run: |
@@ -885,11 +885,11 @@ jobs:
           path: |
             target/${{ matrix.target }}/release/rustup-init
           retention-days: 7
-      - name: Acquire the AWS tooling
+      - name: Ensure we have installed awscli
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
         run: |
-          pip3 install -U setuptools
-          pip3 install awscli
+          which aws
+          aws --version
       - name: Prepare the dist
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
         run: |
diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml
index d2dfbf44de4..13cda6006c1 100644
--- a/ci/actions-templates/linux-builds-template.yaml
+++ b/ci/actions-templates/linux-builds-template.yaml
@@ -153,11 +153,11 @@ jobs: # skip-master skip-pr skip-stable
           path: |
             target/${{ matrix.target }}/release/rustup-init
           retention-days: 7
-      - name: Acquire the AWS tooling
+      - name: Ensure we have installed awscli
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
         run: |
-          pip3 install -U setuptools
-          pip3 install awscli
+          which aws
+          aws --version
       - name: Prepare the dist
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
         run: |