diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 5617764a08be..63391704cfca 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -437,8 +437,7 @@ jobs:
           path: ./bin/*
 
   build-package:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [cross-compile]
     strategy:
       fail-fast: false