diff --git a/ads/feature_store/docs/source/figures/oci_fs_container.png b/ads/feature_store/docs/source/figures/oci_fs_container.png
new file mode 100644
index 000000000..7f92f25dd
Binary files /dev/null and b/ads/feature_store/docs/source/figures/oci_fs_container.png differ
diff --git a/ads/feature_store/docs/source/setup_feature_store.rst b/ads/feature_store/docs/source/setup_feature_store.rst
index e532cc05c..da370973a 100644
--- a/ads/feature_store/docs/source/setup_feature_store.rst
+++ b/ads/feature_store/docs/source/setup_feature_store.rst
@@ -14,6 +14,11 @@ _____________________________________________________________________
 
 We can manually export images to OCIR using Marketplace UI and then deploy the obtained Helm Chart. Optionally, we can also setup `Feature Store API Gateway stack <https://github.com/oracle-samples/oci-data-science-ai-samples/blob/main/feature_store/README.md>`_ for authentication and authorization.
 
+
+:doc:`Deployment using Container Service <./user_guides.setup.container>`
+_________________________________________________________________________
+This is the quickest way to get hands on with feature store. We can manually export images to OCIR using Marketplace UI and then deploy the obtained images using the container service stack.
+
 .. _Database configuration:
 
 Database configuration
@@ -36,7 +41,6 @@ Here ``feature-store-dynamic-group`` is the dynamic group corresponding to the i
 .. seealso::
     `Dynamic groups <https://docs.oracle.com/en-us/iaas/Content/Identity/Tasks/callingservicesfrominstances.htm#:~:text=Dynamic%20groups%20allow%20you%20to,against%20Oracle%20Cloud%20Infrastructure%20services.>`_
 
-
 .. _Policies:
 Policies
 ---------
@@ -77,3 +81,4 @@ Known Issues
 
   ./user_guides.setup.feature_store_operator
   ./user_guides.setup.helm_chart
+  ./user_guides.setup.container
diff --git a/ads/feature_store/docs/source/user_guides.setup.container.rst b/ads/feature_store/docs/source/user_guides.setup.container.rst
new file mode 100644
index 000000000..74d584c3d
--- /dev/null
+++ b/ads/feature_store/docs/source/user_guides.setup.container.rst
@@ -0,0 +1,8 @@
+================================================
+Deployment using Container Service (Recommended for new setup)
+================================================
+
+The Feature Store container service stack helps in quickly setting up OCI feature store using the OCI container service. The stack is deployed using the Oracle Resource Manager service.
+For details please refer the documentation on `GitHub <https://github.com/oracle-samples/oci-data-science-ai-samples/tree/main/feature_store/container_terraform>`_
+
+.. image:: figures/oci_fs_container.png
diff --git a/ads/feature_store/docs/source/user_guides.setup.feature_store_operator.rst b/ads/feature_store/docs/source/user_guides.setup.feature_store_operator.rst
index 063b10942..9e593ca03 100644
--- a/ads/feature_store/docs/source/user_guides.setup.feature_store_operator.rst
+++ b/ads/feature_store/docs/source/user_guides.setup.feature_store_operator.rst
@@ -1,5 +1,5 @@
 ======================================================
-Deployment Using Feature Store Operator (Recommended)
+Deployment Using Feature Store Operator (Recommended for deploying in existing cluster)
 ======================================================
 
 The Feature Store marketplace operator uses your current infrastructure to set up a Feature Store. It helps in setting up the Feature Store API server in your exisiting OKE cluster and MySQL database.
diff --git a/ads/opctl/backend/marketplace/helm_helper.py b/ads/opctl/backend/marketplace/helm_helper.py
index 8c55c3712..d9cea2338 100644
--- a/ads/opctl/backend/marketplace/helm_helper.py
+++ b/ads/opctl/backend/marketplace/helm_helper.py
@@ -129,7 +129,7 @@ def check_helm_pull(helm_chart_url: str, version: str) -> HelmPullStatus:
     stderr = result.stderr.decode("utf-8")
     if result.returncode == 0:
         return HelmPullStatus.SUCCESS
-    elif "unauthorized" in stderr.lower():
+    elif "unauthorized" in stderr.lower() or "forbidden" in stderr.lower():
         logger.debug(stderr)
         return HelmPullStatus.AUTHENTICATION_FAILURE
     else: