diff --git a/CHANGES.rst b/CHANGES.rst
index daf7f4d6..a725b1ed 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -53,10 +53,10 @@ Unreleased
 ----------
 - Add support of python 3.12 at CI
 - Add Support of pytest 8
+- Switch to gherkin official package: https://pypi.org/project/ci-environment/
 
 2.1.0
 ----------
-- Using official cucmber ci-environment lib
 - Add validation for legacy cucumber.json output
 - Migrated to Pydantic 2
 - Add tests for PyPy
diff --git a/pyproject.toml b/pyproject.toml
index b60fd361..e69dd87e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,12 +43,12 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12"
 ]
-# This is needed until ci-environment&messages become regular PyPi packages
 dependencies = [
   "aiohttp",
   "attrs",
   "certifi",
-  "cuke-ci-environment==0.1.0",
+  "ci-environment",
+  # This is needed until messages become regular PyPi package https://github.com/cucumber/messages/pull/165
   "cuke-messages==0.1.0",
   "cucumber-expressions",
   "decopatch",