diff --git a/README.md b/README.md
index ea445ad..ebbae8b 100644
--- a/README.md
+++ b/README.md
@@ -88,8 +88,12 @@ Any public or private repository can run this workflow by copying [greet_with_jo
 ## Usage
 
 ```yaml
-name: "Greet With A Joke"
-on: [issues,pull_request]
+name: "Greet With A Random Joke"
+on:
+  issues:
+    types: [opened, reopened]
+  pull_request:
+    types: [opened, reopened]
 
 jobs:
   test:
@@ -99,9 +103,10 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
       - name: mast joke mara
-        uses: deep5050/MastjokeMara@main
+        uses: deep5050/MastJokeMara@main
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 ````
 
 
diff --git a/dist/index.js b/dist/index.js
index 1bae1c6..f864fe7 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -15,9 +15,10 @@ const github_token = core.getInput('GITHUB_TOKEN');
 const context = github.context;
 
 const owner = context.payload.sender.login;
+const repoOwner = context.payload.repository.owner.login;
 
-if (owner.includes("[bot]")) {
-    console.log("Avoiding bot comments....");
+if (owner.includes("[bot]") || owner === repoOwner) {
+    console.log("Avoiding issues /PR opened by bot / Owner....");
     process.exit(0);
 }
 
@@ -62,12 +63,10 @@ async function run(joke) {
         console.log(`Running on ${event}......`);
 
 
-
-       // console.log(`eventname: ${github.context.eventName}`)
-       // console.log(`payload sender: ${JSON.stringify(github.context.payload.sender, undefined, 2)}`)
+        // console.log(`eventname: ${github.context.eventName}`)
+        // console.log(`payload sender: ${JSON.stringify(github.context.payload.sender, undefined, 2)}`)
         // console.log(`workflow: ${github.context.workflow}`)
-       // console.log(`payload: ${JSON.stringify(github.context.payload, undefined, 2)}`)
-
+        // console.log(`payload: ${JSON.stringify(github.context.payload, undefined, 2)}`)
 
 
         var issueNumber;
diff --git a/greet_with_joke.yml b/greet_with_joke.yml
index 0eaf4ee..fec2648 100644
--- a/greet_with_joke.yml
+++ b/greet_with_joke.yml
@@ -1,5 +1,9 @@
-name: "Greet With A Joke"
-on: [issues,pull_request]
+name: "Greet With A Random Joke"
+on:
+  issues:
+    types: [opened, reopened]
+  pull_request:
+    types: [opened, reopened]
 
 jobs:
   test:
@@ -9,6 +13,6 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
       - name: mast joke mara
-        uses: deep5050/MastjokeMara@main
+        uses: deep5050/MastJokeMara@main
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/index.js b/index.js
index 5c92778..965c792 100644
--- a/index.js
+++ b/index.js
@@ -8,9 +8,10 @@ const github_token = core.getInput('GITHUB_TOKEN');
 const context = github.context;
 
 const owner = context.payload.sender.login;
+const repoOwner = context.payload.repository.owner.login;
 
-if (owner.includes("[bot]")) {
-    console.log("Avoiding bot comments....");
+if (owner.includes("[bot]") || owner === repoOwner) {
+    console.log("Avoiding issues/PR opened by bot/repo owner....");
     process.exit(0);
 }
 
@@ -55,10 +56,10 @@ async function run(joke) {
         console.log(`Running on ${event}......`);
 
 
-       // console.log(`eventname: ${github.context.eventName}`)
-       // console.log(`payload sender: ${JSON.stringify(github.context.payload.sender, undefined, 2)}`)
+        // console.log(`eventname: ${github.context.eventName}`)
+        // console.log(`payload sender: ${JSON.stringify(github.context.payload.sender, undefined, 2)}`)
         // console.log(`workflow: ${github.context.workflow}`)
-       // console.log(`payload: ${JSON.stringify(github.context.payload, undefined, 2)}`)
+        // console.log(`payload: ${JSON.stringify(github.context.payload, undefined, 2)}`)
 
 
         var issueNumber;