diff --git a/client/ayon_core/__init__.py b/client/ayon_core/__init__.py
index 5f9eb6cea3..1a21da9735 100644
--- a/client/ayon_core/__init__.py
+++ b/client/ayon_core/__init__.py
@@ -3,10 +3,13 @@ import os
 
 AYON_CORE_ROOT = os.path.dirname(os.path.abspath(__file__))
 
-# TODO remove after '1.x.x'
+# -------------------------
+# DEPRECATED - Remove before '1.x.x' release
+# -------------------------
 PACKAGE_DIR = AYON_CORE_ROOT
 PLUGINS_DIR = os.path.join(AYON_CORE_ROOT, "plugins")
 AYON_SERVER_ENABLED = True
 
 # Indicate if AYON entities should be used instead of OpenPype entities
-USE_AYON_ENTITIES = False
+USE_AYON_ENTITIES = True
+# -------------------------