diff --git a/.github/actions/build_mlir/action.yml b/.github/actions/build_mlir/action.yml
index b2e6e49..20a29bf 100644
--- a/.github/actions/build_mlir/action.yml
+++ b/.github/actions/build_mlir/action.yml
@@ -11,13 +11,6 @@ runs:
               path: torch-mlir
               ref: 'cpu-proto'
               submodules: recursive
-        - name: Install system and Intel packages
-          shell: bash -el {0}
-          run: |
-              curl https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
-              echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
-              sudo apt-get update
-              sudo apt-get install -y build-essential intel-basekit
         - name: Build torch-mlir
           shell: bash -el {0}
           run: |
diff --git a/.github/actions/initial_setup/action.yml b/.github/actions/initial_setup/action.yml
index 2984b64..b7236dd 100644
--- a/.github/actions/initial_setup/action.yml
+++ b/.github/actions/initial_setup/action.yml
@@ -14,13 +14,6 @@ inputs:
 runs:
     using: composite
     steps:
-        - uses: conda-incubator/setup-miniconda@v2
-          with:
-              miniforge-variant: Mambaforge
-              miniforge-version: latest
-              use-mamba: true
-              activate-environment: ${{ inputs.conda_env }}-test
-
         - name: Get Date
           id: get-date
           run: echo "today=$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT
@@ -31,7 +24,7 @@ runs:
           uses: actions/cache@v3
           env:
               # Increase this value to reset cache if etc/example-environment.yml has not changed
-              CACHE_NUMBER: 0
+              CACHE_NUMBER: 1
           with:
               path: ${{ env.CONDA }}/envs
               key: >-
@@ -43,18 +36,13 @@ runs:
         - name: Update conda env
           if: steps.conda-cache.outputs.cache-hit != 'true'
           shell: bash -el {0}
-          run: mamba env update -n ${{ inputs.conda_env }}-test -f tests/conda-envs/${{ inputs.conda_env }}.yaml
+          run: conda env update -n ${{ inputs.conda_env }}-test -f tests/conda-envs/${{ inputs.conda_env }}.yaml
 
         - uses: ./.github/actions/build_mlir
           if: ${{ inputs.conda_env == 'mlir' }}
 
-        - name: Install compiler for dynamo
-          shell: bash -el {0}
-          run: |
-              sudo apt-get update
-              sudo apt-get install -y build-essential
-          if: ${{ inputs.compiler == 'dynamo' }}
-
         - name: Setup benchmarks package
           shell: bash -el {0}
-          run: pip install -e .
+          run: |
+              conda activate ${{ inputs.conda_env }}
+              pip install -e .
diff --git a/.github/workflows/mlp-test.yml b/.github/workflows/mlp-test.yml
index 4c4c61b..7056468 100644
--- a/.github/workflows/mlp-test.yml
+++ b/.github/workflows/mlp-test.yml
@@ -41,6 +41,7 @@ jobs:
             - name: Run MLP test on specific compiler
               shell: bash -el {0}
               run: |
+                  conda activate ${{ inputs.conda_env }}
                   benchmark-run \
                     --host spr \
                     --benchmark mlp \
diff --git a/tests/conda-envs/cpu.yaml b/tests/conda-envs/cpu.yaml
index 0180b98..b769970 100644
--- a/tests/conda-envs/cpu.yaml
+++ b/tests/conda-envs/cpu.yaml
@@ -1,4 +1,4 @@
-name: cpu-test
+name: cpu
 channels:
   - pytorch
 dependencies:
diff --git a/tests/conda-envs/cuda.yaml b/tests/conda-envs/cuda.yaml
index fce7921..06c0afa 100644
--- a/tests/conda-envs/cuda.yaml
+++ b/tests/conda-envs/cuda.yaml
@@ -1,4 +1,4 @@
-name: cuda-test
+name: cuda
 channels:
   - pytorch
   - nvidia
diff --git a/tests/conda-envs/ipex.yaml b/tests/conda-envs/ipex.yaml
index 683f4f7..d136704 100644
--- a/tests/conda-envs/ipex.yaml
+++ b/tests/conda-envs/ipex.yaml
@@ -1,4 +1,4 @@
-name: ipex-test
+name: ipex
 channels:
   - intel
   - conda-forge
diff --git a/tests/conda-envs/mlir.yaml b/tests/conda-envs/mlir.yaml
index 8db27b1..7ef625b 100644
--- a/tests/conda-envs/mlir.yaml
+++ b/tests/conda-envs/mlir.yaml
@@ -1,4 +1,4 @@
-name: mlir-test
+name: mlir
 channels:
   - intel
 dependencies:
diff --git a/tests/docker/README.md b/tests/docker/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/tests/scripts/build-mlir.sh b/tests/scripts/build-mlir.sh
index a39bdc1..6e921d9 100755
--- a/tests/scripts/build-mlir.sh
+++ b/tests/scripts/build-mlir.sh
@@ -4,7 +4,7 @@ if (( $# != 1 )); then
     >&2 echo "Need path to torch-mlir repository as an argument."
 fi
 
-conda activate mlir-test
+conda activate mlir
 
 cd $1
 pip install -r requirements.txt