diff --git a/pkgs/aws/aws-cli/registry.yaml b/pkgs/aws/aws-cli/registry.yaml
index 9d1f978be7d..bc1ddfc2b62 100644
--- a/pkgs/aws/aws-cli/registry.yaml
+++ b/pkgs/aws/aws-cli/registry.yaml
@@ -3,10 +3,17 @@ packages:
     repo_owner: aws
     repo_name: aws-cli
     description: The AWS Command Line Interface (AWS CLI) is a unified tool that provides a consistent interface for interacting with all parts of Amazon Web Services
-    search_words:
-      - Linux Only
     version_source: github_tag
     url: https://awscli.amazonaws.com/awscli-exe-{{.OS}}-{{.Arch}}-{{.Version}}.zip
+    overrides:
+      - goos: darwin
+        url: https://awscli.amazonaws.com/AWSCLIV2-{{.Version}}.{{.Format}}
+        format: pkg
+        files:
+          - name: aws
+            src: aws-cli.pkg/Payload/aws-cli/aws
+          - name: aws_completer
+            src: aws-cli.pkg/Payload/aws-cli/aws_completer
     files:
       - name: aws
         src: aws/dist/aws
@@ -17,3 +24,4 @@ packages:
       arm64: aarch64
     supported_envs:
       - linux
+      - darwin
diff --git a/registry.yaml b/registry.yaml
index d6d9840691d..a2b836b8e6c 100644
--- a/registry.yaml
+++ b/registry.yaml
@@ -3922,10 +3922,17 @@ packages:
     repo_owner: aws
     repo_name: aws-cli
     description: The AWS Command Line Interface (AWS CLI) is a unified tool that provides a consistent interface for interacting with all parts of Amazon Web Services
-    search_words:
-      - Linux Only
     version_source: github_tag
     url: https://awscli.amazonaws.com/awscli-exe-{{.OS}}-{{.Arch}}-{{.Version}}.zip
+    overrides:
+      - goos: darwin
+        url: https://awscli.amazonaws.com/AWSCLIV2-{{.Version}}.{{.Format}}
+        format: pkg
+        files:
+          - name: aws
+            src: aws-cli.pkg/Payload/aws-cli/aws
+          - name: aws_completer
+            src: aws-cli.pkg/Payload/aws-cli/aws_completer
     files:
       - name: aws
         src: aws/dist/aws
@@ -3936,6 +3943,7 @@ packages:
       arm64: aarch64
     supported_envs:
       - linux
+      - darwin
   - type: github_release
     repo_owner: aws
     repo_name: copilot-cli