diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e6da15389..2b90f347b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -12,15 +12,17 @@ Changelog
 ------
 Fixed
 ^^^^^
-- TODO
+- Fix enums not quoted (#1776)
 
 Added
 ^^^^^
 - JSONField adds optional generic support, and supports OpenAPI document generation by specifying `field_type` as a pydantic BaseModel (#1763)
 
+Changed
+^^^^^^^
+- Change old pydantic docs link to new one (#1775).
 
-
-0.21.7
+0.21.7 <../0.21.7>`_ - 2024-10-14
 ------
 Fixed
 ^^^^^
@@ -36,11 +38,7 @@ Added
 - Add POSIX Regex support for PostgreSQL and MySQL (#1714)
 - support app=None for tortoise.contrib.fastapi.RegisterTortoise (#1733)
 
-Changed
-^^^^^^^
-- Change old pydantic docs link to new one (#1775).
-
-0.21.6
+0.21.6 <../0.21.6>`_ - 2024-08-17
 ------
 Fixed
 ^^^^^
diff --git a/poetry.lock b/poetry.lock
index eb7a5c6a4..d3849fa45 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2658,15 +2658,11 @@ name = "pypika-tortoise"
 version = "0.2.2"
 description = "Forked from pypika and streamline just for tortoise-orm"
 optional = false
-python-versions = "^3.8"
-files = []
-develop = false
-
-[package.source]
-type = "git"
-url = "https://github.com/waketzheng/pypika-tortoise.git"
-reference = "fix-enums-not-quoted"
-resolved_reference = "fa416608801e35673ca74d5a1b8a0a4bc10c75e0"
+python-versions = ">=3.8,<4.0"
+files = [
+    {file = "pypika_tortoise-0.2.2-py3-none-any.whl", hash = "sha256:e93190aedd95acb08b69636bc2328cc053b2c9971307b6d44405bc6d9f9b71a5"},
+    {file = "pypika_tortoise-0.2.2.tar.gz", hash = "sha256:f0fbc9e0c3ddc33118a5be69907428863849df60788e125edef1f46a6261d63b"},
+]
 
 [[package]]
 name = "pytest"
@@ -3279,13 +3275,13 @@ test = ["pytest"]
 
 [[package]]
 name = "starlette"
-version = "0.41.2"
+version = "0.41.3"
 description = "The little ASGI library that shines."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "starlette-0.41.2-py3-none-any.whl", hash = "sha256:fbc189474b4731cf30fcef52f18a8d070e3f3b46c6a04c97579e85e6ffca942d"},
-    {file = "starlette-0.41.2.tar.gz", hash = "sha256:9834fd799d1a87fd346deb76158668cfa0b0d56f85caefe8268e2d97c3468b62"},
+    {file = "starlette-0.41.3-py3-none-any.whl", hash = "sha256:44cedb2b7c77a9de33a8b74b2b90e9f50d11fcf25d8270ea525ad71a25374ff7"},
+    {file = "starlette-0.41.3.tar.gz", hash = "sha256:0e4ab3d16522a255be6b28260b938eae2482f98ce5cc934cb08dce8dc3ba5835"},
 ]
 
 [package.dependencies]
@@ -3859,4 +3855,4 @@ psycopg = ["psycopg"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8"
-content-hash = "0ec5d6f895b1695a2d0444278d844357af043edf69e251c1d1d62d30de723a7b"
+content-hash = "fe730e9093d0549d2152dfdc8775c428e72a9a2ea48b2b789f16bfa172ebf66e"
diff --git a/pyproject.toml b/pyproject.toml
index 9f43ec034..e8d4bada1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tortoise-orm"
-version = "0.21.7"
+version = "0.21.8"
 description = "Easy async ORM for python, built with relations in mind"
 authors = ["Andrey Bondar <andrey@bondar.ru>", "Nickolas Grigoriadis <nagrigoriadis@gmail.com>", "long2ice <long2ice@gmail.com>"]
 license = "Apache-2.0"
@@ -36,7 +36,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-pypika-tortoise = { git = "https://github.com/waketzheng/pypika-tortoise.git", branch = "fix-enums-not-quoted" }
+pypika-tortoise = "^0.2.2"
 iso8601 = "^2.1.0"
 aiosqlite = ">=0.16.0, <0.21.0"
 pytz = "*"