diff --git a/py3-aiofiles.yaml b/py3-aiofiles.yaml
index 7295d63e55b..12d08d74c97 100644
--- a/py3-aiofiles.yaml
+++ b/py3-aiofiles.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-aiofiles
   version: "25.1.0"
-  epoch: 0
+  epoch: 1
   description: File support for asyncio.
   copyright:
     - license: Apache-2.0
@@ -24,13 +24,15 @@ environment:
   contents:
     packages:
       - py3-supported-build-base
+      - py3-supported-hatch-vcs
       - py3-supported-hatchling
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: a8d728f0a29de45dc521f18f07297428d56992a742f0cd2701ba86e44d23d5b2
-      uri: https://files.pythonhosted.org/packages/source/a/aiofiles/aiofiles-${{package.version}}.tar.gz
+      repository: https://github.com/Tinche/aiofiles
+      tag: v${{package.version}}
+      expected-commit: 348f5ef6561c2b2c8a7497bd10487eab4102332f
 
 subpackages:
   - range: py-versions
@@ -74,5 +76,7 @@ test:
 
 update:
   enabled: true
-  release-monitor:
-    identifier: 12743
+  github:
+    identifier: Tinche/aiofiles
+    strip-prefix: v
+    tag-filter-prefix: v
diff --git a/py3-aiosignal.yaml b/py3-aiosignal.yaml
index f3ffe4b8f04..7430c277380 100644
--- a/py3-aiosignal.yaml
+++ b/py3-aiosignal.yaml
@@ -2,7 +2,7 @@
 package:
   name: py3-aiosignal
   version: "1.4.0"
-  epoch: 2
+  epoch: 3
   description: 'aiosignal: a list of registered asynchronous callbacks'
   copyright:
     - license: Apache-2.0
@@ -30,10 +30,11 @@ environment:
       - wolfi-base
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: f47eecd9468083c2029cc99945502cb7708b082c232f9aca65da147157b251c7
-      uri: https://files.pythonhosted.org/packages/source/a/aiosignal/aiosignal-${{package.version}}.tar.gz
+      repository: https://github.com/aio-libs/aiosignal
+      tag: v${{package.version}}
+      expected-commit: 1cf80149c869d410c90a58e85e9c703be6ef8692
 
 subpackages:
   - range: py-versions
@@ -72,8 +73,10 @@ subpackages:
 
 update:
   enabled: true
-  release-monitor:
-    identifier: 41889
+  github:
+    identifier: aio-libs/aiosignal
+    strip-prefix: v
+    tag-filter-prefix: v
 
 test:
   pipeline:
diff --git a/py3-amazon-q-developer-jupyterlab-ext.yaml b/py3-amazon-q-developer-jupyterlab-ext.yaml
index 37dec6a7204..6fd860d0e49 100644
--- a/py3-amazon-q-developer-jupyterlab-ext.yaml
+++ b/py3-amazon-q-developer-jupyterlab-ext.yaml
@@ -29,6 +29,7 @@ environment:
       - py3-supported-jupyter-packaging
 
 pipeline:
+  # Apparently no public git repository
   - uses: fetch
     with:
       expected-sha256: bc0c680118dedb1f1600b0491c92416a270336acbae2e865b55186edf02b9508
diff --git a/py3-ansible-runner-http.yaml b/py3-ansible-runner-http.yaml
index 9b19881c87a..9d3892caf60 100644
--- a/py3-ansible-runner-http.yaml
+++ b/py3-ansible-runner-http.yaml
@@ -26,6 +26,7 @@ environment:
       - py3-supported-build-base
 
 pipeline:
+  # https://github.com/ansible/ansible-runner-http is archived and no commit exactly corresponds to the sdist on PyPI
   - uses: fetch
     with:
       expected-sha256: e2f34880531d4088a5e04967fd5eae602eb400cc4eb541b22c8c6853e342587f
diff --git a/py3-apache-beam.yaml b/py3-apache-beam.yaml
index aa02a86eef7..e9194ab1f0d 100644
--- a/py3-apache-beam.yaml
+++ b/py3-apache-beam.yaml
@@ -26,6 +26,7 @@ environment:
       - py3-supported-gpep517
 
 pipeline:
+  # TODO: Should use git-checkout from https://github.com/apache/beam, but that requires unpackaged protoc-gen-mypy.
   - uses: fetch
     with:
       expected-sha256: 85d381df3941eedff88ccd0dafb6b4a28006d912c8a0cb9d065b7ae5f4f7bd40
diff --git a/py3-appdirs.yaml b/py3-appdirs.yaml
index 9bcd9edf5c0..dc61d796794 100644
--- a/py3-appdirs.yaml
+++ b/py3-appdirs.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-appdirs
   version: 1.4.4
-  epoch: 9
+  epoch: 10
   description: a small python module for appdir support
   copyright:
     - license: MIT
@@ -26,10 +26,11 @@ environment:
       - py3-supported-build-base
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      uri: https://files.pythonhosted.org/packages/source/a/appdirs/appdirs-${{package.version}}.tar.gz
-      expected-sha256: 7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41
+      repository: https://github.com/ActiveState/appdirs
+      tag: ${{package.version}}
+      expected-commit: 7af32e0b1fe57070ae8b5a717cdaebc094449518
 
 subpackages:
   - range: py-versions
@@ -73,5 +74,5 @@ test:
 
 update:
   enabled: true
-  release-monitor:
-    identifier: 6278
+  github:
+    identifier: ActiveState/appdirs
diff --git a/py3-argon2-cffi.yaml b/py3-argon2-cffi.yaml
index a8d15b77ea3..9b5771e635d 100644
--- a/py3-argon2-cffi.yaml
+++ b/py3-argon2-cffi.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-argon2-cffi
   version: "25.1.0"
-  epoch: 4
+  epoch: 5
   description: Argon2 for Python
   copyright:
     - license: MIT
@@ -26,13 +26,15 @@ environment:
       - py3-supported-build-base
       - py3-supported-cffi
       - py3-supported-hatch-fancy-pypi-readme
+      - py3-supported-hatch-vcs
       - py3-supported-hatchling
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 694ae5cc8a42f4c4e2bf2ca0e64e51e23a040c6a517a85074683d3959e1346c1
-      uri: https://files.pythonhosted.org/packages/source/a/argon2-cffi/argon2_cffi-${{package.version}}.tar.gz
+      repository: https://github.com/hynek/argon2-cffi
+      tag: ${{package.version}}
+      expected-commit: 1fcae4fc1b7ff192b5ade54f6616771e5cf5f391
 
 subpackages:
   - range: py-versions
@@ -78,5 +80,5 @@ test:
 
 update:
   enabled: true
-  release-monitor:
-    identifier: 33377
+  github:
+    identifier: hynek/argon2-cffi
diff --git a/py3-avro-python3.yaml b/py3-avro-python3.yaml
index 401e4b98cb6..fc645d50ec9 100644
--- a/py3-avro-python3.yaml
+++ b/py3-avro-python3.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-avro-python3
   version: 1.10.2
-  epoch: 6
+  epoch: 7
   description: Avro is a serialization and RPC framework.
   copyright:
     - license: Apache-2.0
@@ -26,10 +26,11 @@ environment:
       - py3-supported-build-base
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 3b63f24e6b04368c3e4a6f923f484be0230d821aad65ac36108edbff29e9aaab
-      uri: https://files.pythonhosted.org/packages/source/a/avro-python3/avro-python3-${{package.version}}.tar.gz
+      repository: https://github.com/apache/avro
+      tag: release-${{package.version}}
+      expected-commit: 8111cdc35430ff68dcb644306362859de40999d9
 
 subpackages:
   - range: py-versions
@@ -41,10 +42,13 @@ subpackages:
       - uses: py/pip-build-install
         with:
           python: python${{range.key}}
+        working-directory: lang/py3
       - name: move usr/bin executables for -bin
         runs: |
           mkdir -p ./cleanup/${{range.key}}/
           mv ${{targets.contextdir}}/usr/bin ./cleanup/${{range.key}}/
+      - runs: |
+          rm -rf ${{targets.contextdir}}/usr/lib/python${{range.key}}/site-packages/avro/tests
       - uses: strip
     test:
       pipeline:
@@ -109,6 +113,9 @@ test:
         avro --help
 
 update:
-  enabled: true
-  release-monitor:
-    identifier: 73324
+  enabled: false
+  exclude-reason: "Deprecated in favour of https://pypi.org/project/avro/; same repository, but built from lang/py instead of lang/py3.  May require renaming package to py3-avro?"
+  github:
+    identifier: apache/avro
+    strip-prefix: release-
+    tag-filter-prefix: release-