diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
index 78aa01e..a1afeed 100644
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.10]
+        python-version: ["3.10"]
       fail-fast: false
 
     steps:
diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml
index bc6333c..917aab1 100644
--- a/.github/workflows/publish-package.yml
+++ b/.github/workflows/publish-package.yml
@@ -43,6 +43,6 @@ jobs:
 
       - name: Publish package
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@1.5.1
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/setup.cfg b/setup.cfg
index c944b19..451f17e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,24 +1,25 @@
 [bumpversion]
 current_version = 1.9.0
 commit = True
-tag = False
+commit_args = --no-verify
+tag = True
 tag_name = {new_version}
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\+\w+-(?P<dev>\d+))?
-serialize = 
-	{major}.{minor}.{patch}+{$USER}-{dev}
+serialize =
+	{major}.{minor}.{patch}+{$BRANCH_NAME}-{dev}
 	{major}.{minor}.{patch}
 message = Version updated from {current_version} to {new_version}
 
 [metadata]
 name = django-categories
-version = 1.8.0
+version = attr:categories.__version__
 description = A way to handle one or more hierarchical category trees in django.
 long_description = file:README.md
-long_description_content_type = "text/markdown"
+long_description_content_type = text/markdown
 author = Corey Oordt
 author_email = coreyoordt@gmail.com
 url = http://github.com/jazzband/django-categories
-classifiers = 
+classifiers =
 	Framework :: Django
 
 [options]
@@ -26,7 +27,7 @@ zip_safe = False
 include_package_data = True
 
 [options.packages.find]
-exclude = 
+exclude =
 	example*
 	docs
 	build
@@ -34,7 +35,7 @@ include = categories
 
 [flake8]
 ignore = D203,W503,E501
-exclude = 
+exclude =
 	.git
 	.tox
 	docs