diff --git a/.github/workflows/terraform_plan.yaml b/.github/workflows/terraform_plan.yaml
index 580953b..559c0be 100644
--- a/.github/workflows/terraform_plan.yaml
+++ b/.github/workflows/terraform_plan.yaml
@@ -19,10 +19,6 @@ jobs:
     runs-on: ["229685449397"]
     
     env:
-      GITHUB_APP_INSTALLATION_ID: ${{ vars.GH_APP_INSTALLATION_ID }}
-      GITHUB_APP_PEM_FILE: ${{ secrets.GH_APP_PEM_FILE }}
-      GITHUB_OWNER: CSVD
-      GITHUB_BASE_URL: https://github.e.it.census.gov/
       TF_WORKSPACE: ${{ vars.terraform_workspace }}
       TF_CLI_ARGS_plan: -lock-timeout=30m
       TF_CLI_ARGS_apply: -lock-timeout=30m
@@ -50,7 +46,7 @@ jobs:
         with:
           github_app_pem_file: ${{ secrets.GH_APP_PEM_FILE }}
           github_app_installation_id: ${{ vars.GH_APP_INSTALLATION_ID }}
-          github_base_url: ${{ vars.GITHUB_BASE_URL }}
+          github_base_url: ${{ github.server_url }}
           
       - name: Terraform Init
         uses: CSVD/terraform-init@main
@@ -96,10 +92,8 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ steps.aws_auth.outputs.aws_secret_access_key }}
           AWS_SESSION_TOKEN: ${{ steps.aws_auth.outputs.aws_session_token }}
           GITHUB_TOKEN: ${{ steps.github_credentials.outputs.github_token }}
-          GITHUB_OWNER: CSVD
-          GITHUB_BASE_URL: https://github.e.it.census.gov/
+          GITHUB_OWNER: ${{ github.repository_owner }}
+          GITHUB_BASE_URL: ${{ github.server_url }}
           HTTP_PROXY: http://proxy.tco.census.gov:3128
           HTTPS_PROXY: http://proxy.tco.census.gov:3128
           NO_PROXY: ".census.gov,169.254.169.254,148.129.*,10.*,172.18.*,172.22.*,172.23.*,172.24.*,172.25.*,.eks.amazonaws.com,.s3.amazonaws.com,.amazonaws.com"
-
-