diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
index 521cc77bd64..9db9106b9ff 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -88,19 +88,39 @@ jobs:
         poll-interval-seconds: 20s
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Prepare System Test env.yaml and system
+    - name: Prepare System Test env.yaml and 0.6.x system
+      if: ${{ github.ref != 'refs/heads/0.5.x' }}
       run: |
         python automation/system_test/prepare.py run \
           ${{ steps.computed_params.outputs.mlrun_version }} \
-          ${{ secrets.SYSTEM_TEST_DATA_CLUSTER_IP }} \
-          ${{ secrets.SYSTEM_TEST_DATA_CLUSTER_SSH_PASSWORD }} \
-          ${{ secrets.SYSTEM_TEST_APP_CLUSTER_SSH_PASSWORD }} \
+          ${{ secrets.V06_SYSTEM_TEST_DATA_CLUSTER_IP }} \
+          ${{ secrets.V06_SYSTEM_TEST_DATA_CLUSTER_SSH_PASSWORD }} \
+          ${{ secrets.V06_SYSTEM_TEST_APP_CLUSTER_SSH_PASSWORD }} \
           ${{ secrets.SYSTEM_TEST_GITHUB_ACCESS_TOKEN }} \
-          ${{ secrets.SYSTEM_TEST_MLRUN_DB_PATH }} \
-          ${{ secrets.SYSTEM_TEST_WEBAPI_DIRECT_URL }} \
-          ${{ secrets.SYSTEM_TEST_USERNAME }} \
-          ${{ secrets.SYSTEM_TEST_ACCESS_KEY }} \
-          ${{ secrets.SYSTEM_TEST_PASSWORD }} \
+          ${{ secrets.V06_SYSTEM_TEST_MLRUN_DB_PATH }} \
+          ${{ secrets.V06_SYSTEM_TEST_WEBAPI_DIRECT_URL }} \
+          ${{ secrets.V06_SYSTEM_TEST_USERNAME }} \
+          ${{ secrets.V06_SYSTEM_TEST_ACCESS_KEY }} \
+          ${{ secrets.V06_SYSTEM_TEST_PASSWORD }} \
+          --override-image-registry "${{ steps.computed_params.outputs.mlrun_docker_registry }}" \
+          --override-image-repo ${{ steps.computed_params.outputs.mlrun_docker_repo }} \
+          --override-mlrun-images \
+          "${{ steps.computed_params.outputs.mlrun_docker_registry }}${{ steps.computed_params.outputs.mlrun_docker_repo }}/mlrun-api:${{ steps.computed_params.outputs.mlrun_version }},ghcr.io/mlrun/mlrun-ui:${{ steps.computed_params.outputs.mlrun_ui_version }}"
+
+    - name: Prepare System Test env.yaml and 0.5.x system
+      if: ${{ github.ref == 'refs/heads/0.5.x' }}
+      run: |
+        python automation/system_test/prepare.py run \
+          ${{ steps.computed_params.outputs.mlrun_version }} \
+          ${{ secrets.V05_SYSTEM_TEST_DATA_CLUSTER_IP }} \
+          ${{ secrets.V05_SYSTEM_TEST_DATA_CLUSTER_SSH_PASSWORD }} \
+          ${{ secrets.V05_SYSTEM_TEST_APP_CLUSTER_SSH_PASSWORD }} \
+          ${{ secrets.SYSTEM_TEST_GITHUB_ACCESS_TOKEN }} \
+          ${{ secrets.V05_SYSTEM_TEST_MLRUN_DB_PATH }} \
+          ${{ secrets.V05_SYSTEM_TEST_WEBAPI_DIRECT_URL }} \
+          ${{ secrets.V05_SYSTEM_TEST_USERNAME }} \
+          ${{ secrets.V05_SYSTEM_TEST_ACCESS_KEY }} \
+          ${{ secrets.V05_SYSTEM_TEST_PASSWORD }} \
           --override-image-registry "${{ steps.computed_params.outputs.mlrun_docker_registry }}" \
           --override-image-repo ${{ steps.computed_params.outputs.mlrun_docker_repo }} \
           --override-mlrun-images \