diff --git a/docs/SETUP.md b/docs/SETUP.md
index 33e0ea30..063b7e4f 100644
--- a/docs/SETUP.md
+++ b/docs/SETUP.md
@@ -83,6 +83,11 @@ pip install -e fclib
 
 The library is installed in developer mode with the `-e` flag. This means that all changes made to the library locally, are immediately available.
 
+If you work with Linux or MacOS, you could also install Ray for parallel model training:
+```
+pip install ray>=0.8.2 
+``` 
+
 #### Jupyter kernel
 In order to run the example notebooks, make sure to run the notebooks in the conda environment we previously set up, `forecasting_env`. To register the conda environment in Jupyter, please run:
 
diff --git a/fclib/requirements.txt b/fclib/requirements.txt
index 3d6e3d6a..6952f30c 100644
--- a/fclib/requirements.txt
+++ b/fclib/requirements.txt
@@ -6,5 +6,5 @@ requests>=2.23.0
 tqdm>=4.43.0
 matplotlib>=3.1.2
 tensorflow==2.0
-azureml-sdk[explain,automl]==1.0.85
-gitpython>=3.0.8
\ No newline at end of file
+gitpython>=3.0.8
+azureml-sdk==1.0.85
diff --git a/tests/ci/cpu_integration_tests_linux.yml b/tests/ci/cpu_integration_tests_linux.yml
index 0f780c40..fa68495c 100644
--- a/tests/ci/cpu_integration_tests_linux.yml
+++ b/tests/ci/cpu_integration_tests_linux.yml
@@ -41,6 +41,7 @@ jobs:
       yes | conda env create -n forecast_cpu -f tools/environment.yml
       eval "$(conda shell.bash hook)" && conda activate forecast_cpu
       pip install -e fclib
+      pip install ray>=0.8.2
       echo "Conda env installed."
     displayName: 'Creating conda environment with dependencies'
 
diff --git a/tests/ci/cpu_unit_tests_linux.yml b/tests/ci/cpu_unit_tests_linux.yml
index 66c8f456..2b9d4cf6 100644
--- a/tests/ci/cpu_unit_tests_linux.yml
+++ b/tests/ci/cpu_unit_tests_linux.yml
@@ -41,6 +41,7 @@ jobs:
       yes | conda env create -n forecast_cpu -f tools/environment.yml
       eval "$(conda shell.bash hook)" && conda activate forecast_cpu
       pip install -e fclib
+      pip install ray>=0.8.2
       echo "Conda env installed."
     displayName: 'Creating Conda Environment with dependencies'
 
diff --git a/tools/environment.yml b/tools/environment.yml
index 202db229..8eb60259 100644
--- a/tools/environment.yml
+++ b/tools/environment.yml
@@ -38,7 +38,6 @@ dependencies:
     - tensorflow==2.0
     - tensorboard==2.1.0
     - nteract-scrapbook==0.3.1
-    - azureml-sdk[explain,automl]==1.0.85
     - statsmodels>=0.11.1
     - pmdarima>=1.1.1
-    - ray>=0.8.2
+    - azureml-sdk[explain,automl]==1.0.85
diff --git a/tools/environment_setup.sh b/tools/environment_setup.sh
index 0040e22a..0aea2289 100755
--- a/tools/environment_setup.sh
+++ b/tools/environment_setup.sh
@@ -14,5 +14,8 @@ eval "$(conda shell.bash hook)" && conda activate forecasting_env
 # Install forecasting utility library
 pip install -e fclib
 
+# Install ray (available only on Linux and MacOS)
+pip install ray>=0.8.2 
+
 # Register conda environment in Jupyter
 python -m ipykernel install --user --name forecasting_env