diff --git a/.github/workflows/on_master_generation.yml b/.github/workflows/on_master_generation.yml
new file mode 100644
index 00000000..609b95f8
--- /dev/null
+++ b/.github/workflows/on_master_generation.yml
@@ -0,0 +1,31 @@
+name: Generate on commit to master
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+jobs:
+  GenerateOnMaster:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.17
+        id: go
+
+      - run: make format
+      - name: Commit & Push changes
+        run: |
+          if [[ ! -z  $(git status --porcelain) ]]; then
+            git config --local user.email elasticcloudclients@elastic.co
+            git config --local user.name elasticcloudclients
+            git add NOTICE
+            git commit -m "Update NOTICE"
+            git push
+          fi
diff --git a/NOTICE b/NOTICE
index 2f538dc7..68f06184 100755
--- a/NOTICE
+++ b/NOTICE
@@ -17,4 +17,6 @@ github.com/asaskevich/govalidator    MIT
 github.com/spf13/viper               MIT
 github.com/stretchr/testify          MIT
 
+
+
 =========================================================================