diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index ea9b893e..d4bb0477 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -22,7 +22,7 @@ jobs:
           go build -o ory .
           ./ory tunnel http://localhost:4001 --quiet &
         env:
-          ORY_API_KEY: ${{ secrets.ORY_PROJECT_API_KEY }}
+          ORY_PROJECT_API_KEY: ${{ secrets.ORY_PROJECT_API_KEY }}
           ORY_PROJECT_SLUG: admiring-tu-swczqlujc0
       - name: Install dependencies
         working-directory: cmd/cloudx/e2e
@@ -62,7 +62,7 @@ jobs:
           go build -o ory .
           ./ory proxy https://ory-network-httpbin-ijakee5waq-ez.a.run.app/anything --rewrite-host --quiet &
         env:
-          ORY_API_KEY: ${{ secrets.ORY_PROJECT_API_KEY }}
+          ORY_PROJECT_API_KEY: ${{ secrets.ORY_PROJECT_API_KEY }}
           ORY_PROJECT_SLUG: admiring-tu-swczqlujc0
       - name: Install Node
         working-directory: cmd/cloudx/e2e
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f6e3e159..2e511666 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
           ./ory proxy https://ory-network-httpbin-ijakee5waq-ez.a.run.app --quiet --rewrite-host &
           npm run test
         env:
-          ORY_API_KEY: nokey
+          ORY_PROJECT_API_KEY: nokey
           ORY_PROJECT_SLUG: affectionate-archimedes-s9mkjq77k0
           ORY_CONSOLE_URL: https://console.staging.ory.dev
           ORY_ORYAPIS_URL: https://staging.oryapis.dev
diff --git a/cmd/cloudx/client/api_key.go b/cmd/cloudx/client/api_key.go
index 6011bbd3..05f2a9c9 100644
--- a/cmd/cloudx/client/api_key.go
+++ b/cmd/cloudx/client/api_key.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 
 	cloud "github.com/ory/client-go"
 	"github.com/ory/x/cmdx"
@@ -65,7 +66,7 @@ func (h *CommandHelper) DeleteWorkspaceAPIKey(ctx context.Context, workspaceID,
 }
 
 func (h *CommandHelper) TemporaryAPIKey(ctx context.Context, name string) (apiKey string, cleanup func() error, err error) {
-	if ak := GetProjectAPIKeyFromEnvironment(); len(ak) > 0 {
+	if ak := os.Getenv(ProjectAPIKey); len(ak) > 0 {
 		return ak, noop, nil
 	}
 
diff --git a/cmd/cloudx/client/tokens.go b/cmd/cloudx/client/tokens.go
deleted file mode 100644
index 8af73252..00000000
--- a/cmd/cloudx/client/tokens.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright © 2023 Ory Corp
-// SPDX-License-Identifier: Apache-2.0
-
-package client
-
-import (
-	"os"
-)
-
-// GetProjectAPIKeyFromEnvironment returns the project API key from the environment variable.
-func GetProjectAPIKeyFromEnvironment() string {
-	return os.Getenv("ORY_API_KEY")
-}
diff --git a/cmd/cloudx/project/patch_oauth2_config_test.go b/cmd/cloudx/project/patch_oauth2_config_test.go
index b7061954..a859735a 100644
--- a/cmd/cloudx/project/patch_oauth2_config_test.go
+++ b/cmd/cloudx/project/patch_oauth2_config_test.go
@@ -51,8 +51,6 @@ func TestPatchHydraConfig(t *testing.T) {
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
 			runWithProjectAsDefault(ctx, t, defaultProject.Id, tc.doPatch)
 			runWithProjectAsFlag(ctx, t, extraProject.Id, tc.doPatch)
 		})