diff --git a/.gitea/workflows/pr-validation.yml b/.gitea/workflows/pr-validation.yml
index 667c990..5011708 100644
--- a/.gitea/workflows/pr-validation.yml
+++ b/.gitea/workflows/pr-validation.yml
@@ -33,17 +33,18 @@ jobs:
           check-latest: true
           cache: false
 
+      - name: Install AWS CLI v2
+        uses: ankurk91/install-aws-cli-action@v1
+
       - name: Ensure tooling is available
         run: |
           set -euo pipefail
 
-          if ! command -v aws >/dev/null 2>&1; then
-            pipx install awscli
-          fi
+          aws --version
 
           if ! command -v jq >/dev/null 2>&1; then
-            sudo apt-get update
-            sudo apt-get install -y jq
+            apt-get update
+            apt-get install -y jq
           fi
 
       - name: Run full unit test suite with coverage
diff --git a/.gitea/workflows/push-validation.yml b/.gitea/workflows/push-validation.yml
index 3ce08e8..d042aae 100644
--- a/.gitea/workflows/push-validation.yml
+++ b/.gitea/workflows/push-validation.yml
@@ -33,13 +33,11 @@ jobs:
           check-latest: true
           cache: false
 
-      - name: Ensure tooling is available
-        run: |
-          set -euo pipefail
+      - name: Install AWS CLI v2
+        uses: ankurk91/install-aws-cli-action@v1
 
-          if ! command -v aws >/dev/null 2>&1; then
-            pipx install awscli
-          fi
+      - name: Verify AWS CLI
+        run: aws --version
 
       - name: Run full unit test suite with coverage
         id: coverage