diff --git a/.github/workflows/dev-qa-prod.yml b/.github/workflows/dev-qa-prod.yml
deleted file mode 100644
index 44d8734..0000000
--- a/.github/workflows/dev-qa-prod.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-
-# https://medium.com/devops-techable/github-actions-and-google-cloud-build-triggers-d55aceb96e68 
-name: GCP Cloud Build, Test and Deploy
-
-on:
-  push:
-    branches: 
-    - dev
-    - qa
-    - prod
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - id: 'auth'
-      uses: 'google-github-actions/auth@v1'
-      with:
-        credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
-
-    - name: 'Set up Cloud SDK'
-      uses: 'google-github-actions/setup-gcloud@v1'
-
-    - name: 'Use gcloud CLI'
-      run: 'gcloud info'
-
-    - name: 'Start Google Cloud Build trigger'
-      run: |
-        export CLOUDSDK_CORE_DISABLE_PROMPTS=1
-        chmod +x ./scripts/wait-for-build
-        ./scripts/wait-for-build ${{ secrets.GCP_BUILD_BUILD_ID }} ${GITHUB_REF##*/} Build
-  
-  unit-test:
-    name: Test (Unit)
-    runs-on: ubuntu-latest
-    needs: [build]
-    steps:
-    - uses: actions/checkout@v3
-    - id: 'auth'
-      uses: 'google-github-actions/auth@v1'
-      with:
-        credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
-
-    - name: 'Set up Cloud SDK'
-      uses: 'google-github-actions/setup-gcloud@v1'
-
-    - name: 'Use gcloud CLI'
-      run: 'gcloud info'
-
-    - name: 'Start Google Cloud Build trigger'
-      run: |
-        export CLOUDSDK_CORE_DISABLE_PROMPTS=1
-        chmod +x ./scripts/wait-for-build
-        ./scripts/wait-for-build ${{ secrets.GCP_BUILD_TEST_ID }} ${GITHUB_REF##*/} "Test (Unit)"
-
-  integration-test:
-    name: Test (Integration)
-    runs-on: ubuntu-latest
-    needs: [build]
-    steps:
-    - uses: actions/checkout@v3
-    - id: 'auth'
-      uses: 'google-github-actions/auth@v1'
-      with:
-        credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
-
-    - name: 'Set up Cloud SDK'
-      uses: 'google-github-actions/setup-gcloud@v1'
-
-    - name: 'Use gcloud CLI'
-      run: 'gcloud info'
-
-    - name: 'Start Google Cloud Build trigger'
-      run: |
-        export CLOUDSDK_CORE_DISABLE_PROMPTS=1
-        chmod +x ./scripts/wait-for-build
-        ./scripts/wait-for-build ${{ secrets.GCP_BUILD_TEST_ID }} ${GITHUB_REF##*/} "Test (Integration)"
-
-  deploy:
-    name: Deploy
-    runs-on: ubuntu-latest
-    needs: [unit-test, integration-test]
-    steps:
-    - uses: actions/checkout@v3
-    - id: 'auth'
-      uses: 'google-github-actions/auth@v1'
-      with:
-        credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
-
-    - name: 'Set up Cloud SDK'
-      uses: 'google-github-actions/setup-gcloud@v1'
-
-    - name: 'Use gcloud CLI'
-      run: 'gcloud info'
-
-    - name: 'Start Google Cloud Build trigger'
-      run: |
-        export CLOUDSDK_CORE_DISABLE_PROMPTS=1
-        chmod +x ./scripts/wait-for-build
-        ./scripts/wait-for-build ${{ secrets.GCP_BUILD_DEPLOY_ID }} ${GITHUB_REF##*/} Deploy
-
-  cleanup:
-    name: Cleanup Test Artifacts
-    runs-on: ubuntu-latest
-    needs: [unit-test, integration-test]
-    steps:
-    - uses: actions/checkout@v3
-    - id: 'auth'
-      uses: 'google-github-actions/auth@v1'
-      with:
-        credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
-
-    - name: Set outputs
-      id: vars
-      run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-    - name: 'Set up Cloud SDK'
-      uses: 'google-github-actions/setup-gcloud@v1'
-
-    - name: 'Use gcloud CLI'
-      run: 'gcloud info'
-
-    - name: 'Start Google Cloud Build trigger'
-      run: |
-        export CLOUDSDK_CORE_DISABLE_PROMPTS=1
-        gcloud artifacts docker images delete northamerica-northeast2-docker.pkg.dev/automatic-bot-376307/continuus/${{ steps.vars.outputs.sha_short }}-test --delete-tags
-
diff --git a/.github/workflows/feature-workflow.yml b/.github/workflows/feature-workflow.yml
index eed7e69..514a274 100644
--- a/.github/workflows/feature-workflow.yml
+++ b/.github/workflows/feature-workflow.yml
@@ -9,7 +9,7 @@ on:
     - 'qa'
     - 'prod'
     - 'demo'
-    - 'arun_terraform_demo'
+    - 'arunterraformdemo'
 
 jobs:
   build:
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index cace30a..0161226 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -7,14 +7,14 @@ on:
       - 'qa'
       - 'prod'
       - 'demo'
-      - 'arun_terraform_demo'
+      - 'arunterraformdemo'
   pull_request:
     branches:
       - 'dev'
       - 'qa'
       - 'prod'
       - 'demo'
-      - 'arun_terraform_demo'
+      - 'arunterraformdemo'
 
 permissions:
   pull-requests: write
@@ -71,8 +71,11 @@ jobs:
             <details><summary>Show Plan</summary>
             \`\`\`\n
             ${process.env.PLAN}
+            Once merged and build is complete, your deployment will be available at: 
+            [${{ github.base_ref }}-hmcu4gyu5a-pd.a.run.app/](${{ github.base_ref }}-hmcu4gyu5a-pd.a.run.app/)
             \`\`\`
             </details>
+
             *Pushed by: @${{ github.actor }}, Action: \`${{ github.event_name }}\`*`;
             github.rest.issues.createComment({
               issue_number: context.issue.number,
diff --git a/cloudbuild/feature-build.yaml b/cloudbuild/feature-build.yaml
index a9b51b5..021e7ee 100644
--- a/cloudbuild/feature-build.yaml
+++ b/cloudbuild/feature-build.yaml
@@ -3,7 +3,6 @@ steps:
   - name: 'gcr.io/cloud-builders/docker'
     entrypoint: 'bash'
     args: ['-c', 'docker build . --tag northamerica-northeast2-docker.pkg.dev/automatic-bot-376307/continuus/$SHORT_SHA-test -f docker/test/Dockerfile']  
-    waitFor: ['-']
 
   # Docker Push
   - name: 'gcr.io/cloud-builders/docker'
diff --git a/main.tf b/main.tf
index a77cc8e..2aa847c 100644
--- a/main.tf
+++ b/main.tf
@@ -5,7 +5,7 @@ resource "google_cloudbuild_trigger" "build-trigger" {
     name  = "Continuus"
     //Events section  
     push {
-      branch = "dev|qa|prod|demo|arun_terraform_demo"
+      branch = "dev|qa|prod|demo|arunterraformdemo"
     }
   }
   ignored_files = [".gitignore"]