zakisk · zakisk · Apr 28, 2026 · Apr 29, 2026
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -80,17 +80,17 @@ jobs:
       TEST_GITHUB_REPO_OWNER_WEBHOOK: openshift-pipelines/pipelines-as-code-e2e-tests-webhook
       TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
 
-      # GitHub Enterprise (Second)
-      TEST_GITHUB_SECOND_API_URL: ghe.pipelinesascode.com
-      TEST_GITHUB_SECOND_EL_URL: https://ghe.paac-127-0-0-1.nip.io
-      TEST_GITHUB_SECOND_REPO_INSTALLATION_ID: 1
-      TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
-      TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
-      TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
-      TEST_GITHUB_SECOND_WEBHOOK_ORG: pac-e2e-webhook-tests
-      TEST_GITHUB_SECOND_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_TOKEN }}
-      TEST_GITHUB_SECOND_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}
-      TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
+      # GitHub Enterprise
+      TEST_GITHUB_GHE_API_URL: ghe.pipelinesascode.com
+      TEST_GITHUB_GHE_EL_URL: https://ghe.paac-127-0-0-1.nip.io
+      TEST_GITHUB_GHE_REPO_INSTALLATION_ID: 1
+      TEST_GITHUB_GHE_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
+      TEST_GITHUB_GHE_SMEE_URL: ${{ secrets.TEST_GITHUB_GHE_SMEE_URL }}
+      TEST_GITHUB_GHE_TOKEN: ${{ secrets.TEST_GITHUB_GHE_TOKEN }}
+      TEST_GITHUB_GHE_WEBHOOK_ORG: pac-e2e-webhook-tests
+      TEST_GITHUB_GHE_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_GHE_WEBHOOK_TOKEN }}
+      TEST_GITHUB_GHE_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_GHE_WEBHOOK_SECRET }}
+      TEST_GITHUB_GHE_APPLICATION_ID: ${{ vars.TEST_GITHUB_GHE_APPLICATION_ID }}
 
       # GitLab
       TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
@@ -220,7 +220,7 @@ jobs:
       - name: Run gosmee for second controller GHE App
         if: startsWith(matrix.provider, 'github_ghe') || matrix.provider == 'concurrency'
         run: |
-          nohup gosmee client --saveDir /tmp/gosmee-replay-ghe "${TEST_GITHUB_SECOND_SMEE_URL}" "https://ghe.paac-127-0-0-1.nip.io" >> /tmp/gosmee-ghe.log 2>&1 &
+          nohup gosmee client --saveDir /tmp/gosmee-replay-ghe "${TEST_GITHUB_GHE_SMEE_URL}" "https://ghe.paac-127-0-0-1.nip.io" >> /tmp/gosmee-ghe.log 2>&1 &
 
       - name: Generate unique gosmee URL for GHE webhook tests
         if: startsWith(matrix.provider, 'github_ghe') || matrix.provider == 'concurrency'
@@ -233,9 +233,9 @@ jobs:
       - name: Run gosmee for second controller GHE webhook
         if: startsWith(matrix.provider, 'github_ghe') || matrix.provider == 'concurrency'
         env:
-          TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
+          TEST_GITHUB_GHE_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
         run: |
-          nohup gosmee client --saveDir /tmp/gosmee-replay-ghe-webhook "${TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL}" "https://ghe.paac-127-0-0-1.nip.io" >> /tmp/gosmee-ghe-webhook.log 2>&1 &
+          nohup gosmee client --saveDir /tmp/gosmee-replay-ghe-webhook "${TEST_GITHUB_GHE_WEBHOOK_SMEE_URL}" "https://ghe.paac-127-0-0-1.nip.io" >> /tmp/gosmee-ghe-webhook.log 2>&1 &
 
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@c0afd6f790e3a5564914980036ebf83216678101 # v3
@@ -262,18 +262,18 @@ jobs:
           TEST_GITHUB_REPO_OWNER_WEBHOOK: openshift-pipelines/pipelines-as-code-e2e-tests-webhook
           TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
 
-          # GitHub Enterprise (Second)
-          TEST_GITHUB_SECOND_API_URL: ghe.pipelinesascode.com
-          TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
-          TEST_GITHUB_SECOND_EL_URL: https://ghe.paac-127-0-0-1.nip.io
-          TEST_GITHUB_SECOND_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}
-          TEST_GITHUB_SECOND_REPO_INSTALLATION_ID: 1
-          TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
-          TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
-          TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
-          TEST_GITHUB_SECOND_WEBHOOK_ORG: pac-e2e-webhook-tests
-          TEST_GITHUB_SECOND_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}
-          TEST_GITHUB_SECOND_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_TOKEN }}
+          # GitHub Enterprise
+          TEST_GITHUB_GHE_API_URL: ghe.pipelinesascode.com
+          TEST_GITHUB_GHE_APPLICATION_ID: ${{ vars.TEST_GITHUB_GHE_APPLICATION_ID }}
+          TEST_GITHUB_GHE_EL_URL: https://ghe.paac-127-0-0-1.nip.io
+          TEST_GITHUB_GHE_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_GHE_PRIVATE_KEY }}
+          TEST_GITHUB_GHE_REPO_INSTALLATION_ID: 1
+          TEST_GITHUB_GHE_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
+          TEST_GITHUB_GHE_SMEE_URL: ${{ secrets.TEST_GITHUB_GHE_SMEE_URL }}
+          TEST_GITHUB_GHE_TOKEN: ${{ secrets.TEST_GITHUB_GHE_TOKEN }}
+          TEST_GITHUB_GHE_WEBHOOK_ORG: pac-e2e-webhook-tests
+          TEST_GITHUB_GHE_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_GHE_WEBHOOK_SECRET }}
+          TEST_GITHUB_GHE_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_GHE_WEBHOOK_TOKEN }}
 
           # GitLab
           TEST_GITLAB_API_URL: https://gitlab.com
@@ -311,7 +311,7 @@ jobs:
         env:
           PAC_DIR: ${{ github.workspace }}
           VARS_APPLICATION_ID: ${{ vars.APPLICATION_ID }}
-          VARS_TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
+          VARS_TEST_GITHUB_GHE_APPLICATION_ID: ${{ vars.TEST_GITHUB_GHE_APPLICATION_ID }}
         run: |
           mkdir -p ~/secrets
           echo "${VARS_APPLICATION_ID}" > ~/secrets/github-application-id
@@ -321,10 +321,10 @@ jobs:
 
 
           mkdir -p ~/secrets-second
-          echo "${VARS_TEST_GITHUB_SECOND_APPLICATION_ID}" > ~/secrets-second/github-application-id
-          echo "${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}" > ~/secrets-second/github-private-key
-          echo "${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}" > ~/secrets-second/webhook.secret
-          echo "${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}" > ~/secrets-second/smee
+          echo "${VARS_TEST_GITHUB_GHE_APPLICATION_ID}" > ~/secrets-second/github-application-id
+          echo "${{ secrets.TEST_GITHUB_GHE_PRIVATE_KEY }}" > ~/secrets-second/github-private-key
+          echo "${{ secrets.TEST_GITHUB_GHE_WEBHOOK_SECRET }}" > ~/secrets-second/webhook.secret
+          echo "${{ secrets.TEST_GITHUB_GHE_SMEE_URL }}" > ~/secrets-second/smee
 
           export PAC_SECRET_FOLDER=~/secrets
           export PAC_SECOND_SECRET_FOLDER=~/secrets-second
@@ -372,8 +372,8 @@ jobs:
           TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
           TEST_GITHUB_REPO_INSTALLATION_ID: ${{ vars.INSTALLATION_ID }}
           TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
-          TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
-          TEST_GITHUB_SECOND_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_TOKEN }}
+          TEST_GITHUB_GHE_TOKEN: ${{ secrets.TEST_GITHUB_GHE_TOKEN }}
+          TEST_GITHUB_GHE_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_GHE_WEBHOOK_TOKEN }}
           TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
           TEST_GITLAB_SECOND_TOKEN: ${{ secrets.TEST_GITLAB_SECOND_TOKEN }}
           TEST_GITLAB_SECOND_GROUP: ${{ vars.TEST_GITLAB_SECOND_GROUP }}
@@ -382,7 +382,7 @@ jobs:
           TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_DATA_CENTER_WEBHOOK_SECRET }}
           TEST_GITEA_SMEEURL: ${{ steps.gosmee-url.outputs.url }}
           TEST_GITLAB_SMEEURL: ${{ steps.gosmee-gitlab-url.outputs.url }}
-          TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
+          TEST_GITHUB_GHE_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
         run: |
           ./hack/gh-workflow-ci.sh run_e2e_tests
 
@@ -396,8 +396,8 @@ jobs:
       - name: Collect logs
         if: ${{ always() }}
         env:
-          TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
-          TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
+          TEST_GITHUB_GHE_SMEE_URL: ${{ secrets.TEST_GITHUB_GHE_SMEE_URL }}
+          TEST_GITHUB_GHE_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
           TEST_GITLAB_SMEEURL: ${{ steps.gosmee-gitlab-url.outputs.url }}
         run: |
           ./hack/gh-workflow-ci.sh collect_logs

diff --git a/hack/gh-workflow-ci.sh b/hack/gh-workflow-ci.sh
@@ -39,27 +39,27 @@ create_pac_github_app_secret() {
 
 create_second_github_app_controller_on_ghe() {
   # Read from environment variables instead of arguments
-  local test_github_second_smee_url="${TEST_GITHUB_SECOND_SMEE_URL}"
-  local test_github_second_private_key="${TEST_GITHUB_SECOND_PRIVATE_KEY}"
-  local test_github_second_application_id="${TEST_GITHUB_SECOND_APPLICATION_ID}"
-  local test_github_second_webhook_secret="${TEST_GITHUB_SECOND_WEBHOOK_SECRET}"
+  local test_github_ghe_smee_url="${TEST_GITHUB_GHE_SMEE_URL}"
+  local test_github_ghe_private_key="${TEST_GITHUB_GHE_PRIVATE_KEY}"
+  local test_github_ghe_application_id="${TEST_GITHUB_GHE_APPLICATION_ID}"
+  local test_github_ghe_webhook_secret="${TEST_GITHUB_GHE_WEBHOOK_SECRET}"
 
   # install uv
   type -p uv >/dev/null 2>&1 || { curl -LsSf https://astral.sh/uv/install.sh | sh; }
 
   ./hack/second-controller.py \
     --controller-image="ko" \
-    --smee-url="${test_github_second_smee_url}" \
+    --smee-url="${test_github_ghe_smee_url}" \
     --ingress-domain="paac-127-0-0-1.nip.io" \
     --namespace="pipelines-as-code" \
     ghe | tee /tmp/generated.yaml
 
   ko apply --insecure-registry -f /tmp/generated.yaml
   kubectl delete secret -n pipelines-as-code ghe-secret || true
   kubectl -n pipelines-as-code create secret generic ghe-secret \
-    --from-literal github-private-key="${test_github_second_private_key}" \
-    --from-literal github-application-id="${test_github_second_application_id}" \
-    --from-literal webhook.secret="${test_github_second_webhook_secret}"
+    --from-literal github-private-key="${test_github_ghe_private_key}" \
+    --from-literal github-application-id="${test_github_ghe_application_id}" \
+    --from-literal webhook.secret="${test_github_ghe_webhook_secret}"
   sed "s/name: pipelines-as-code/name: ghe-configmap/" <config/302-pac-configmap.yaml | kubectl apply -n pipelines-as-code -f-
   kubectl patch configmap -n pipelines-as-code ghe-configmap -p '{"data":{"application-name": "Pipelines as Code GHE"}}'
   kubectl -n pipelines-as-code delete pod -l app.kubernetes.io/name=ghe-controller
@@ -242,7 +242,7 @@ output_logs() {
 collect_logs() {
   # Read from environment variables (use default empty value for optional vars)
   local test_gitea_smee_url="${TEST_GITEA_SMEEURL:-}"
-  local github_ghe_smee_url="${TEST_GITHUB_SECOND_SMEE_URL:-}"
+  local github_ghe_smee_url="${TEST_GITHUB_GHE_SMEE_URL:-}"
   local test_gitlab_smee_url="${TEST_GITLAB_SMEEURL:-}"
 
   mkdir -p /tmp/logs
@@ -331,15 +331,15 @@ help() {
 
   create_second_github_app_controller_on_ghe
     Create the second controller on GHE
-    Required env vars: TEST_GITHUB_SECOND_SMEE_URL, TEST_GITHUB_SECOND_PRIVATE_KEY, TEST_GITHUB_SECOND_WEBHOOK_SECRET
+    Required env vars: TEST_GITHUB_GHE_SMEE_URL, TEST_GITHUB_GHE_PRIVATE_KEY, TEST_GITHUB_GHE_WEBHOOK_SECRET
 
   run_e2e_tests
     Run the e2e tests
     Required env vars: TEST_PROVIDER plus many test-specific environment variables
 
   collect_logs
     Collect logs from the cluster
-    Optional env vars: TEST_GITEA_SMEEURL, TEST_GITHUB_SECOND_SMEE_URL (for scrubbing URLs from logs)
+    Optional env vars: TEST_GITEA_SMEEURL, TEST_GITHUB_GHE_SMEE_URL (for scrubbing URLs from logs)
 
   output_logs
     Will output logs using snazzy formatting when available or otherwise through a simple

diff --git a/test/README.md b/test/README.md
@@ -228,8 +228,8 @@ Example from e2e.yaml workflow:
     PAC_SECOND_SECRET_FOLDER: ~/secrets-second
   run: |
     mkdir -p ~/secrets-second
-    echo "${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}" > ~/secrets-second/github-application-id
-    echo "${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}" > ~/secrets-second/github-private-key
+    echo "${{ vars.TEST_GITHUB_GHE_APPLICATION_ID }}" > ~/secrets-second/github-application-id
+    echo "${{ secrets.TEST_GITHUB_GHE_PRIVATE_KEY }}" > ~/secrets-second/github-private-key
     # ... other secrets ...
 
     cd startpaac

diff --git a/test/github_incoming_test.go b/test/github_incoming_test.go
@@ -198,7 +198,7 @@ func verifyIncomingWebhook(t *testing.T, randomedString, pipelinerunName string,
 	// For GHE + webhook, create a dynamic repo with SMEE webhook
 	if onGHE && onWebhook {
 		repoName := names.SimpleNameGenerator.RestrictLengthWithRandomSuffix("pac-e2e-test")
-		smeeURL := os.Getenv("TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL")
+		smeeURL := os.Getenv("TEST_GITHUB_GHE_WEBHOOK_SMEE_URL")
 		webhookSecret := os.Getenv("TEST_EL_WEBHOOK_SECRET")
 
 		runcnx.Clients.Log.Infof("Creating dynamic GHE repository %s/%s with webhook to %s", opts.Organization, repoName, smeeURL)

diff --git a/test/github_pullrequest_oktotest_test.go b/test/github_pullrequest_oktotest_test.go
@@ -56,7 +56,7 @@ func TestGithubGHEPullRequestOkToTest(t *testing.T) {
 	assert.NilError(t, err)
 	initialPipelineRunCount := len(pruns.Items)
 
-	installID, err := strconv.ParseInt(os.Getenv("TEST_GITHUB_SECOND_REPO_INSTALLATION_ID"), 10, 64)
+	installID, err := strconv.ParseInt(os.Getenv("TEST_GITHUB_GHE_REPO_INSTALLATION_ID"), 10, 64)
 	assert.NilError(t, err)
 
 	sendIssueComment := func(t *testing.T, sender string) {
@@ -90,10 +90,10 @@ func TestGithubGHEPullRequestOkToTest(t *testing.T) {
 
 		err = payload.Send(ctx,
 			g.Cnx,
-			os.Getenv("TEST_GITHUB_SECOND_EL_URL"),
-			os.Getenv("TEST_GITHUB_SECOND_WEBHOOK_SECRET"),
-			os.Getenv("TEST_GITHUB_SECOND_API_URL"),
-			os.Getenv("TEST_GITHUB_SECOND_REPO_INSTALLATION_ID"),
+			os.Getenv("TEST_GITHUB_GHE_EL_URL"),
+			os.Getenv("TEST_GITHUB_GHE_WEBHOOK_SECRET"),
+			os.Getenv("TEST_GITHUB_GHE_API_URL"),
+			os.Getenv("TEST_GITHUB_GHE_REPO_INSTALLATION_ID"),
 			event,
 			"issue_comment",
 		)

diff --git a/test/github_pullrequest_rerequest_test.go b/test/github_pullrequest_rerequest_test.go
@@ -47,7 +47,7 @@ func TestGithubGHEPullRerequest(t *testing.T) {
 		Sender:        g.Options.Organization,
 	}
 
-	installID, err := strconv.ParseInt(os.Getenv("TEST_GITHUB_SECOND_REPO_INSTALLATION_ID"), 10, 64)
+	installID, err := strconv.ParseInt(os.Getenv("TEST_GITHUB_GHE_REPO_INSTALLATION_ID"), 10, 64)
 	assert.NilError(t, err)
 	event := github.CheckRunEvent{
 		Action: github.Ptr("rerequested"),
@@ -78,10 +78,10 @@ func TestGithubGHEPullRerequest(t *testing.T) {
 
 	err = payload.Send(ctx,
 		g.Cnx,
-		os.Getenv("TEST_GITHUB_SECOND_EL_URL"),
-		os.Getenv("TEST_GITHUB_SECOND_WEBHOOK_SECRET"),
-		os.Getenv("TEST_GITHUB_SECOND_API_URL"),
-		os.Getenv("TEST_GITHUB_SECOND_REPO_INSTALLATION_ID"),
+		os.Getenv("TEST_GITHUB_GHE_EL_URL"),
+		os.Getenv("TEST_GITHUB_GHE_WEBHOOK_SECRET"),
+		os.Getenv("TEST_GITHUB_GHE_API_URL"),
+		os.Getenv("TEST_GITHUB_GHE_REPO_INSTALLATION_ID"),
 		event,
 		"check_run",
 	)
@@ -128,10 +128,10 @@ func TestGithubGHEPullRerequest(t *testing.T) {
 
 	err = payload.Send(ctx,
 		g.Cnx,
-		os.Getenv("TEST_GITHUB_SECOND_EL_URL"),
-		os.Getenv("TEST_GITHUB_SECOND_WEBHOOK_SECRET"),
-		os.Getenv("TEST_GITHUB_SECOND_API_URL"),
-		os.Getenv("TEST_GITHUB_SECOND_APPLICATION_ID"),
+		os.Getenv("TEST_GITHUB_GHE_EL_URL"),
+		os.Getenv("TEST_GITHUB_GHE_WEBHOOK_SECRET"),
+		os.Getenv("TEST_GITHUB_GHE_API_URL"),
+		os.Getenv("TEST_GITHUB_GHE_APPLICATION_ID"),
 		csEvent,
 		"check_suite",
 	)
@@ -173,10 +173,10 @@ func TestGithubGHEPullRerequest(t *testing.T) {
 
 	err = payload.Send(ctx,
 		g.Cnx,
-		os.Getenv("TEST_GITHUB_SECOND_EL_URL"),
-		os.Getenv("TEST_GITHUB_SECOND_WEBHOOK_SECRET"),
-		os.Getenv("TEST_GITHUB_SECOND_API_URL"),
-		os.Getenv("TEST_GITHUB_SECOND_REPO_INSTALLATION_ID"),
+		os.Getenv("TEST_GITHUB_GHE_EL_URL"),
+		os.Getenv("TEST_GITHUB_GHE_WEBHOOK_SECRET"),
+		os.Getenv("TEST_GITHUB_GHE_API_URL"),
+		os.Getenv("TEST_GITHUB_GHE_REPO_INSTALLATION_ID"),
 		nullBranchEvent,
 		"check_run",
 	)

diff --git a/test/pkg/configfile/config.go b/test/pkg/configfile/config.go
@@ -35,14 +35,14 @@ type GitHubConfig struct {
 }
 
 type GitHubEnterpriseConfig struct {
-	APIURL             string `env:"TEST_GITHUB_SECOND_API_URL"              json:"api_url"              yaml:"api_url"`
-	Token              string `env:"TEST_GITHUB_SECOND_TOKEN"                json:"token"                yaml:"token"`
-	ControllerURL      string `env:"TEST_GITHUB_SECOND_EL_URL"               json:"controller_url"       yaml:"controller_url"`
-	RepoOwnerGithubApp string `env:"TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP" json:"repo_owner_githubapp" yaml:"repo_owner_githubapp"`
-	RepoInstallationID string `env:"TEST_GITHUB_SECOND_REPO_INSTALLATION_ID" json:"repo_installation_id" yaml:"repo_installation_id"`
-	SmeeURL            string `env:"TEST_GITHUB_SECOND_SMEE_URL"             json:"smee_url"             yaml:"smee_url"`
-	WebhookSmeeURL     string `env:"TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL"     json:"webhook_smee_url"     yaml:"webhook_smee_url"`
-	WebhookOrg         string `env:"TEST_GITHUB_SECOND_WEBHOOK_ORG"          json:"webhook_org"          yaml:"webhook_org"`
+	APIURL             string `env:"TEST_GITHUB_GHE_API_URL"              json:"api_url"              yaml:"api_url"`
+	Token              string `env:"TEST_GITHUB_GHE_TOKEN"                json:"token"                yaml:"token"`
+	ControllerURL      string `env:"TEST_GITHUB_GHE_EL_URL"               json:"controller_url"       yaml:"controller_url"`
+	RepoOwnerGithubApp string `env:"TEST_GITHUB_GHE_REPO_OWNER_GITHUBAPP" json:"repo_owner_githubapp" yaml:"repo_owner_githubapp"`
+	RepoInstallationID string `env:"TEST_GITHUB_GHE_REPO_INSTALLATION_ID" json:"repo_installation_id" yaml:"repo_installation_id"`
+	SmeeURL            string `env:"TEST_GITHUB_GHE_SMEE_URL"             json:"smee_url"             yaml:"smee_url"`
+	WebhookSmeeURL     string `env:"TEST_GITHUB_GHE_WEBHOOK_SMEE_URL"     json:"webhook_smee_url"     yaml:"webhook_smee_url"`
+	WebhookOrg         string `env:"TEST_GITHUB_GHE_WEBHOOK_ORG"          json:"webhook_org"          yaml:"webhook_org"`
 }
 
 type GitLabConfig struct {

diff --git a/test/pkg/configfile/config_test.go b/test/pkg/configfile/config_test.go
@@ -169,9 +169,9 @@ bitbucket_datacenter:
 		"TEST_GITHUB_REPO_OWNER_GITHUBAPP", "TEST_GITHUB_REPO_OWNER_WEBHOOK",
 		"TEST_GITHUB_REPO_INSTALLATION_ID",
 		"TEST_GITHUB_PRIVATE_TASK_NAME", "TEST_GITHUB_PRIVATE_TASK_URL",
-		"TEST_GITHUB_SECOND_API_URL", "TEST_GITHUB_SECOND_TOKEN",
-		"TEST_GITHUB_SECOND_EL_URL", "TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP",
-		"TEST_GITHUB_SECOND_REPO_INSTALLATION_ID",
+		"TEST_GITHUB_GHE_API_URL", "TEST_GITHUB_GHE_TOKEN",
+		"TEST_GITHUB_GHE_EL_URL", "TEST_GITHUB_GHE_REPO_OWNER_GITHUBAPP",
+		"TEST_GITHUB_GHE_REPO_INSTALLATION_ID",
 		"TEST_GITLAB_API_URL", "TEST_GITLAB_TOKEN", "TEST_GITLAB_SECOND_TOKEN",
 		"TEST_GITLAB_GROUP", "TEST_GITLAB_SECOND_GROUP", "TEST_GITLAB_SMEEURL",
 		"TEST_GITEA_API_URL", "TEST_GITEA_INTERNAL_URL", "TEST_GITEA_PASSWORD",
@@ -200,11 +200,11 @@ bitbucket_datacenter:
 		"TEST_GITHUB_REPO_INSTALLATION_ID":          "12345",
 		"TEST_GITHUB_PRIVATE_TASK_NAME":             "task-remote",
 		"TEST_GITHUB_PRIVATE_TASK_URL":              "https://github.com/org/repo/blob/main/task.yaml",
-		"TEST_GITHUB_SECOND_API_URL":                "https://ghe.example.com/api/v3",
-		"TEST_GITHUB_SECOND_TOKEN":                  "ghe-token",
-		"TEST_GITHUB_SECOND_EL_URL":                 "https://ghe-ctrl.example.com",
-		"TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP":   "ghe-org/repo",
-		"TEST_GITHUB_SECOND_REPO_INSTALLATION_ID":   "1",
+		"TEST_GITHUB_GHE_API_URL":                   "https://ghe.example.com/api/v3",
+		"TEST_GITHUB_GHE_TOKEN":                     "ghe-token",
+		"TEST_GITHUB_GHE_EL_URL":                    "https://ghe-ctrl.example.com",
+		"TEST_GITHUB_GHE_REPO_OWNER_GITHUBAPP":      "ghe-org/repo",
+		"TEST_GITHUB_GHE_REPO_INSTALLATION_ID":      "1",
 		"TEST_GITLAB_API_URL":                       "https://gitlab.com",
 		"TEST_GITLAB_TOKEN":                         "glpat-xyz",
 		"TEST_GITLAB_SECOND_TOKEN":                  "glpat-second",