diff --git a/.github/workflows/shared-test.yml b/.github/workflows/shared-test.yml
index 01550a0..dd96a47 100644
--- a/.github/workflows/shared-test.yml
+++ b/.github/workflows/shared-test.yml
@@ -15,14 +15,16 @@ on:
         type: string
         required: true
         description: "JSON array of PHP extensions"
-    secrets:
-      geonames-username:
-        required: true
+      use-secure-environment:
+        type: boolean
+        required: false
+        default: false
+        description: "Whether to use the secure environment"
 
 jobs:
   test:
     env:
-      GEONAMES_USERNAME: ${{ secrets.geonames-username }}
+      GEONAMES_USERNAME: ${{ secrets.GEONAMES_USERNAME }}
     strategy:
       matrix:
         os: ${{ fromJson(inputs.operating-systems) }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 3bf689a..ee436d9 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -44,5 +44,4 @@ jobs:
       operating-systems: '["ubuntu-latest", "macos-latest", "windows-latest"]'
       php-versions: ${{ needs.get-php-info.outputs.versions }}
       php-extensions: ${{ needs.get-php-info.outputs.extensions }}
-    secrets:
-      geonames-username: ${{ secrets.GEONAMES_USERNAME }}
+      use-secure-environment: ${{ github.event.pull_request.head.repo.full_name != github.repository }}