diff --git a/.github/workflows/digger_workflow.yml b/.github/workflows/digger_workflow.yml
index 1ad9061..430de4b 100644
--- a/.github/workflows/digger_workflow.yml
+++ b/.github/workflows/digger_workflow.yml
@@ -1,46 +1,23 @@
-name: Digger Workflow
+name: Digger Pull Request Workflow
 
 on:
+  pull_request:
+    branches: [ "main" ]
+    types: [ opened, synchronize ]
+  issue_comment:
+    types: [created]
   workflow_dispatch:
-    inputs:
-      id:
-        description: 'run identifier'
-        required: false
-      job:
-        required: false
-      comment_id:
-        required: false
-      run_name:
-        required: false
-      spec:
-        description: 'spec input for digger'
-        required: false
-
-run-name: ${{ inputs.run_name}}
-
 
 jobs:
-  digger-job:
+  plan:
+    name: Run digger
     runs-on: ubuntu-latest
-    permissions:
-      contents: write      # required to merge PRs
-      actions: write       # required for plan persistence
-      id-token: write      # required for workload-identity-federation
-      pull-requests: write # required to post PR comments
-      statuses: write      # required to validate combined PR status
-
     steps:
-      - name: digger run ${{github.event.inputs.id}}
-        run: echo digger run ${{ inputs.id }}
-        shell: bash      
-      - uses: actions/checkout@v4
-      
-      - uses: diggerhq/digger@vLatest
-        with:
-          setup-aws: true
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          disable-locking: false
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+    - name: digger run
+      uses: diggerhq/digger@vLatest
+      with:
+        disable-locking: true
+        setup-terraform: true
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/prod/main.tf b/prod/main.tf
index ed17668..fd96376 100644
--- a/prod/main.tf
+++ b/prod/main.tf
@@ -7,9 +7,6 @@ terraform {
   }
     backend "s3" {
     bucket = "amzn-digger-demo-s3"              # Change if a different S3 bucket name was used for the backend 
-    /* Un-comment to use DynamoDB state locking
-    dynamodb_table = "digger-locktable-quickstart-aws"      # Change if a different DynamoDB table name was used for backend
-    */
     key    = "terraform/state"
     region = "us-east-1"
   }