diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 03a2304339e..56bfc093cc9 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -2,7 +2,7 @@ name-template: '$RESOLVED_VERSION Changelog'
 version-resolver:
   minor:
     labels:
-      - 'feature'
+      - 'new feature'
   default: patch
 categories:
   - title: 'New Features in GMT $RESOLVED_VERSION'
diff --git a/.github/workflows/release-baseline-images.yml b/.github/workflows/release-baseline-images.yml
new file mode 100644
index 00000000000..5296ca9aae6
--- /dev/null
+++ b/.github/workflows/release-baseline-images.yml
@@ -0,0 +1,45 @@
+# Upload the ZIP archive of baseline images as a release asset
+
+name: Upload baseline images
+
+# Only run for releases
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  upload-baseline:
+    name: Upload baseline images
+    runs-on: ubuntu-latest
+    if: github.repository == 'GenericMappingTools/gmt'
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3.0.2
+
+    - name: Setup data version control (DVC)
+      uses: iterative/setup-dvc@v1.0.3
+
+    - name: Pull baseline image data from dvc remote
+      run: |
+        dvc pull
+        ls -lhR test/baseline/
+
+    - name: Create the baseline image asset in zip format
+      run: |
+        mkdir baseline-images
+        mkdir baseline-images/test
+        mkdir baseline-images/examples
+        mkdir baseline-images/scripts
+        cp -r test/baseline/* baseline-images/test
+        cp doc/examples/images/*.ps baseline-images/examples
+        cp doc/scripts/images/*.ps baseline-images/scripts
+        zip -r baseline-images baseline-images/ -x "*.dvc"
+        shasum -a 256 baseline-images.zip
+
+    - name: Upload baseline image as a release asset
+      uses: shogo82148/actions-upload-release-asset@v1.6.2
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: baseline-images.zip