diff --git a/agenta-backend/agenta_backend/routers/app_router.py b/agenta-backend/agenta_backend/routers/app_router.py
index fcada15d68..b687d2c305 100644
--- a/agenta-backend/agenta_backend/routers/app_router.py
+++ b/agenta-backend/agenta_backend/routers/app_router.py
@@ -362,10 +362,10 @@ async def create_app_and_variant_from_template(
             app=app,
             variant_name="app.default",
             docker_id_or_template_uri=template_db.template_uri
-            if os.environ["FEATURE_FLAG"] in ["cloud"]
+            if os.environ["FEATURE_FLAG"] in ["cloud", "ee"]
             else template_db.digest,
             tags=f"{image_name}"
-            if os.environ["FEATURE_FLAG"] not in ["cloud"]
+            if os.environ["FEATURE_FLAG"] not in ["cloud", "ee"]
             else None,
             base_name="app",
             config_name="default",
diff --git a/agenta-backend/agenta_backend/services/app_manager.py b/agenta-backend/agenta_backend/services/app_manager.py
index 3d5e338b6d..2a27a2abb1 100644
--- a/agenta-backend/agenta_backend/services/app_manager.py
+++ b/agenta-backend/agenta_backend/services/app_manager.py
@@ -379,7 +379,7 @@ async def add_variant_based_on_image(
     ):
         raise ValueError("App variant or image is None")
 
-    if os.environ["FEATURE_FLAG"] not in ["cloud"]:
+    if os.environ["FEATURE_FLAG"] not in ["cloud", "ee"]:
         if tags in [None, ""]:
             raise ValueError("OSS: Tags is None")