diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c4d90df2c..c2953da41 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,10 +30,36 @@ jobs:
         user: __token__
         password: ${{ secrets.PYPY_API_TOKEN }}
 
+
+
+
+  changelog:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Generate changelog
+        uses: charmixer/auto-changelog-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Commit files
+        run: |
+          git config --local user.email "feedback@materialsproject.org"
+          git config --local user.name "materialsproject"
+          mv CHANGELOG.md docs/
+          git add docs/CHANGELOG.md && git commit -m 'Updated CHANGELOG.md' && echo ::set-env name=push::1 || echo "No changes to CHANGELOG.md"
+
+      - name: Push changes
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+
   docs:
     runs-on: ubuntu-latest
     needs:
     - deploy
+    - changelog
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index e594d9a9c..517e5ae46 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - master
     paths-ignore:
-      - 'CHANGELOG.md'
+      - 'docs/CHANGELOG.md'
 
   pull_request:
     branches: