diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 766492f0b..cfef113bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,6 +25,7 @@ jobs:
       REDIS_SENTINEL_TEST_PASSWORD: sekret
       PROTECTED_REDIS_TEST_ENDPOINT: localhost:6380
       ATHENS_PROTECTED_REDIS_PASSWORD: AthensPass1
+      GA_PULL_REQUEST: ${{github.event.number}}
     runs-on: ubuntu-latest
     services:
       mongo:
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 5585724e5..b8f4b1a11 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -302,13 +302,13 @@ Go to the [create new release page](https://github.com/gomods/athens/releases/ne
 - **Release Title** - Make sure the title is prefixed by the release number including the `v`. If you want to write something creative in the rest of the title, go for it!
 - **Describe this release** - Make sure to write what features this release includes, and any notable bugfixes. Also, thank all the folks who contributed to the release. You can find that information in a link that looks like this: `https://github.com/gomods/athens/compare/$PREVIOUS_TAG...release-$CURRENT_TAG`. Substitute `$PREVIOUS_TAG` for the last semver and `$CURRENT_TAG` to the version in the new release branch
 
-When you're done, press the "Publish Release" button. After you do, our [Drone](https://cloud.drone.io) job will do almost everything.
+When you're done, press the "Publish Release" button. After you do, our Github Actions job will do almost everything.
 
-Make sure the Drone CI/CD job finished, and check in Docker Hub to make sure the new release showed up in the [tags](https://hub.docker.com/r/gomods/athens/tags) section.
+Make sure the Github Actions CI/CD job finished, and check in Docker Hub to make sure the new release showed up in the [tags](https://hub.docker.com/r/gomods/athens/tags) section.
 
 ## Finishing up
 
-The Drone job will do everything except:
+The Github Actions job will do everything except:
 
 - Tweet out about the new release
 - Update the helm chart in the `main` branch
diff --git a/README.md b/README.md
index 9065076a0..b1e17a6e1 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![Athens Banner](./docs/static/banner.png)
 
-[![Build Status](https://cloud.drone.io/api/badges/gomods/athens/status.svg)](https://cloud.drone.io/gomods/athens)
+[![Build Status](https://github.com/gomods/athens/actions/workflows/ci.yml/badge.svg)](https://github.com/gomods/athens/actions/workflows/ci.yml?query=branch%3Amain)
 [![GoDoc](https://godoc.org/github.com/gomods/athens?status.svg)](https://godoc.org/github.com/gomods/athens)
 [![Go Report Card](https://goreportcard.com/badge/github.com/gomods/athens)](https://goreportcard.com/report/github.com/gomods/athens)
 [![codecov](https://codecov.io/gh/gomods/athens/branch/master/graph/badge.svg)](https://codecov.io/gh/gomods/athens)
diff --git a/pkg/stash/with_azureblob_test.go b/pkg/stash/with_azureblob_test.go
index e584e4225..8b0983ea4 100644
--- a/pkg/stash/with_azureblob_test.go
+++ b/pkg/stash/with_azureblob_test.go
@@ -20,7 +20,7 @@ import (
 // and it will ensure that saving to modules at the same time
 // is done synchronously so that only the first module gets saved.
 func TestWithAzureBlob(t *testing.T) {
-	containerName := randomContainerName(os.Getenv("DRONE_PULL_REQUEST"))
+	containerName := randomContainerName(os.Getenv("GA_PULL_REQUEST"))
 	cfg := getAzureTestConfig(containerName)
 	if cfg == nil {
 		t.SkipNow()
diff --git a/pkg/storage/azureblob/azureblob_test.go b/pkg/storage/azureblob/azureblob_test.go
index 5591af5b8..710ab4b2b 100644
--- a/pkg/storage/azureblob/azureblob_test.go
+++ b/pkg/storage/azureblob/azureblob_test.go
@@ -50,7 +50,7 @@ func (s *Storage) clear() error {
 
 func getStorage(t testing.TB) *Storage {
 	t.Helper()
-	containerName := randomContainerName(os.Getenv("DRONE_PULL_REQUEST"))
+	containerName := randomContainerName(os.Getenv("GA_PULL_REQUEST"))
 	cfg := getTestConfig(containerName)
 	if cfg == nil {
 		t.SkipNow()
diff --git a/pkg/storage/gcp/gcp_test.go b/pkg/storage/gcp/gcp_test.go
index b074d20c2..f334e30f4 100644
--- a/pkg/storage/gcp/gcp_test.go
+++ b/pkg/storage/gcp/gcp_test.go
@@ -48,7 +48,7 @@ func (s *Storage) clear() error {
 
 func getStorage(t testing.TB) *Storage {
 	t.Helper()
-	bucketName := randomBucketName(os.Getenv("DRONE_PULL_REQUEST"))
+	bucketName := randomBucketName(os.Getenv("GA_PULL_REQUEST"))
 	cfg := getTestConfig(bucketName)
 	if cfg == nil {
 		// Don't fail if there's no test config, so that these tests don't