diff --git a/.github/workflows/giphy-generator.yml b/.github/workflows/giphy-generator.yml
new file mode 100644
index 00000000000..6a8bdf0eee7
--- /dev/null
+++ b/.github/workflows/giphy-generator.yml
@@ -0,0 +1,24 @@
+on:
+  issues:
+    types: [opened, edited]
+  pull_request:
+    types: [opened, edited]
+  issue_comment:
+    types: [created, edited]
+
+name: GIPHY Generator
+
+jobs:
+  giphy-generator:
+    name: GIPHY Generator
+    runs-on: ubuntu-latest
+    steps:
+      - name: GIPHY Generator
+        id: giphy_generator
+        uses: iamhughes/giphy-generator@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+          GIPHY_TOKEN: ${{ secrets.GIPHY_TOKEN }} # This token should be created on giphy.com: https://developers.giphy.com/dashboard/?create=true
+        with:
+          rating: 'g'
+          lang: 'en'