diff --git a/pkgs/aaif-goose/goose/pkg.yaml b/pkgs/aaif-goose/goose/pkg.yaml
new file mode 100644
index 000000000000..25c53bb14059
--- /dev/null
+++ b/pkgs/aaif-goose/goose/pkg.yaml
@@ -0,0 +1,8 @@
+packages:
+  - name: aaif-goose/goose@v1.39.0
+  - name: aaif-goose/goose
+    version: v1.29.1
+  - name: aaif-goose/goose
+    version: v1.25.0
+  - name: aaif-goose/goose
+    version: v1.0.0
diff --git a/pkgs/block/goose/registry.yaml b/pkgs/aaif-goose/goose/registry.yaml
similarity index 85%
rename from pkgs/block/goose/registry.yaml
rename to pkgs/aaif-goose/goose/registry.yaml
index a03f5cc89c6b..55012cb68fb7 100644
--- a/pkgs/block/goose/registry.yaml
+++ b/pkgs/aaif-goose/goose/registry.yaml
@@ -1,15 +1,17 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/registry.json
 packages:
   - type: github_release
-    repo_owner: block
+    repo_owner: aaif-goose
     repo_name: goose
+    aliases:
+      - name: block/goose
     description: "an open source, extensible AI agent that goes beyond code suggestions - install, execute, edit, and test with any LLM"
     version_constraint: "false"
     version_overrides:
       - version_constraint: semver("< 1.0.0")
         error_message: |
           Please use a version later than v1.0.
-      - version_constraint: semver("<= 1.25.0")
+      - version_constraint: semver("<= 1.29.1")
         asset: goose-{{.Arch}}-{{.OS}}.{{.Format}}
         format: tar.bz2
         replacements:
@@ -32,4 +34,4 @@ packages:
           - linux
           - darwin
         github_artifact_attestations:
-          signer_workflow: block/goose/.github/workflows/release.yml
+          signer_workflow: aaif-goose/goose/.github/workflows/release.yml
diff --git a/pkgs/block/goose/pkg.yaml b/pkgs/block/goose/pkg.yaml
deleted file mode 100644
index d889cb686ae4..000000000000
--- a/pkgs/block/goose/pkg.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-packages:
-  - name: block/goose@v1.29.1
-  - name: block/goose
-    version: v1.25.0
-  - name: block/goose
-    version: v1.0.0
diff --git a/pkgs/mxschmitt/playwright-go/pkg.yaml b/pkgs/mxschmitt/playwright-go/pkg.yaml
new file mode 100644
index 000000000000..e04cdfada41e
--- /dev/null
+++ b/pkgs/mxschmitt/playwright-go/pkg.yaml
@@ -0,0 +1,2 @@
+packages:
+  - name: mxschmitt/playwright-go@v0.6000.0
diff --git a/pkgs/playwright-community/playwright-go/registry.yaml b/pkgs/mxschmitt/playwright-go/registry.yaml
similarity index 84%
rename from pkgs/playwright-community/playwright-go/registry.yaml
rename to pkgs/mxschmitt/playwright-go/registry.yaml
index a32d94bdbd6e..fc05ceb8bcd3 100644
--- a/pkgs/playwright-community/playwright-go/registry.yaml
+++ b/pkgs/mxschmitt/playwright-go/registry.yaml
@@ -1,8 +1,10 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/registry.json
 packages:
   - type: go_install
-    repo_owner: playwright-community
+    repo_owner: mxschmitt
     repo_name: playwright-go
+    aliases:
+      - name: playwright-community/playwright-go
     description: Playwright for Go a browser automation library to control Chromium, Firefox and WebKit with a single API
     files:
       - name: playwright
diff --git a/pkgs/playwright-community/playwright-go/pkg.yaml b/pkgs/playwright-community/playwright-go/pkg.yaml
deleted file mode 100644
index b97f0dc6eb3c..000000000000
--- a/pkgs/playwright-community/playwright-go/pkg.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-packages:
-  - name: playwright-community/playwright-go@v0.6000.0
diff --git a/registry.yaml b/registry.yaml
index 76b292656329..730411242f75 100644
--- a/registry.yaml
+++ b/registry.yaml
@@ -10412,6 +10412,41 @@ packages:
         overrides:
           - goos: windows
             asset: envsubst
+  - type: github_release
+    repo_owner: aaif-goose
+    repo_name: goose
+    aliases:
+      - name: block/goose
+    description: "an open source, extensible AI agent that goes beyond code suggestions - install, execute, edit, and test with any LLM"
+    version_constraint: "false"
+    version_overrides:
+      - version_constraint: semver("< 1.0.0")
+        error_message: |
+          Please use a version later than v1.0.
+      - version_constraint: semver("<= 1.29.1")
+        asset: goose-{{.Arch}}-{{.OS}}.{{.Format}}
+        format: tar.bz2
+        replacements:
+          amd64: x86_64
+          arm64: aarch64
+          darwin: apple-darwin
+          linux: unknown-linux-gnu
+        supported_envs:
+          - linux
+          - darwin
+      - version_constraint: "true"
+        asset: goose-{{.Arch}}-{{.OS}}.{{.Format}}
+        format: tar.bz2
+        replacements:
+          amd64: x86_64
+          arm64: aarch64
+          darwin: apple-darwin
+          linux: unknown-linux-gnu
+        supported_envs:
+          - linux
+          - darwin
+        github_artifact_attestations:
+          signer_workflow: aaif-goose/goose/.github/workflows/release.yml
   - type: github_release
     name: aakso/ssh-inscribe/sshi
     repo_owner: aakso
@@ -20072,39 +20107,6 @@ packages:
             files:
               - name: blender
                 src: Blender.app/Contents/MacOS/Blender
-  - type: github_release
-    repo_owner: block
-    repo_name: goose
-    description: "an open source, extensible AI agent that goes beyond code suggestions - install, execute, edit, and test with any LLM"
-    version_constraint: "false"
-    version_overrides:
-      - version_constraint: semver("< 1.0.0")
-        error_message: |
-          Please use a version later than v1.0.
-      - version_constraint: semver("<= 1.25.0")
-        asset: goose-{{.Arch}}-{{.OS}}.{{.Format}}
-        format: tar.bz2
-        replacements:
-          amd64: x86_64
-          arm64: aarch64
-          darwin: apple-darwin
-          linux: unknown-linux-gnu
-        supported_envs:
-          - linux
-          - darwin
-      - version_constraint: "true"
-        asset: goose-{{.Arch}}-{{.OS}}.{{.Format}}
-        format: tar.bz2
-        replacements:
-          amd64: x86_64
-          arm64: aarch64
-          darwin: apple-darwin
-          linux: unknown-linux-gnu
-        supported_envs:
-          - linux
-          - darwin
-        github_artifact_attestations:
-          signer_workflow: block/goose/.github/workflows/release.yml
   - type: github_release
     repo_owner: blopker
     repo_name: codebook
@@ -66699,6 +66701,18 @@ packages:
         overrides:
           - goos: windows
             format: zip
+  - type: go_install
+    repo_owner: mxschmitt
+    repo_name: playwright-go
+    aliases:
+      - name: playwright-community/playwright-go
+    description: Playwright for Go a browser automation library to control Chromium, Firefox and WebKit with a single API
+    files:
+      - name: playwright
+    version_constraint: "false"
+    version_overrides:
+      - version_constraint: "true"
+        path: github.com/playwright-community/playwright-go/cmd/playwright
   - type: github_release
     repo_owner: nabeken
     repo_name: go-github-apps
@@ -73897,16 +73911,6 @@ packages:
       type: github_release
       asset: pscale_{{trimV .Version}}_checksums.txt
       algorithm: sha256
-  - type: go_install
-    repo_owner: playwright-community
-    repo_name: playwright-go
-    description: Playwright for Go a browser automation library to control Chromium, Firefox and WebKit with a single API
-    files:
-      - name: playwright
-    version_constraint: "false"
-    version_overrides:
-      - version_constraint: "true"
-        path: github.com/playwright-community/playwright-go/cmd/playwright
   - type: github_release
     repo_owner: plexsystems
     repo_name: sinker