diff --git a/eng/pipelines/common/setup-jdk.yml b/eng/pipelines/common/setup-jdk.yml
index ce435db673db..b321092cb862 100644
--- a/eng/pipelines/common/setup-jdk.yml
+++ b/eng/pipelines/common/setup-jdk.yml
@@ -1,12 +1,25 @@
 parameters:
-  jdkFolder: $(JAVA_HOME_17_X64)
+  jdkFolder: '$(JAVA_HOME_17_X64)'
   jdkMajorVersion: 17
 
 steps:
 # Setup JDK Paths (gradle needs it)
 - bash: |
-    echo "##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkFolder }}"
-    echo "##vso[task.setvariable variable=JAVA_HOME]${{ parameters.jdkFolder }}"
+    if [ -n "${{ parameters.jdkFolder }}" ]; then
+      jdkPath="${{ parameters.jdkFolder }}"
+      echo "Using provided JDK folder: $jdkPath"
+    else
+      jdkPath=$(/usr/libexec/java_home -V 2>&1 | grep -E "${{ parameters.jdkMajorVersion }}.jdk" | head -n 1 | awk '{print $NF}')
+      if [ -n "$jdkPath" ]; then
+        echo "Found JDK path: $jdkPath"
+      else
+        echo "Unable to find JDK ${{ parameters.jdkMajorVersion }}"
+        exit 1
+      fi
+    fi
+    echo "##vso[task.setvariable variable=JI_JAVA_HOME]$jdkPath"
+    echo "##vso[task.setvariable variable=JAVA_HOME]$jdkPath"
+    echo "JAVA_HOME set to '$jdkPath'"
   displayName: Setup JDK ${{ parameters.jdkMajorVersion }} Paths
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
 
@@ -24,6 +37,7 @@ steps:
       echo "JAVA_HOME set to '$env:JAVA_HOME'"
     } else {
       echo "Unable to set JAVA_HOME"
+      exit 1
     }
   displayName: Setup JDK ${{ parameters.jdkMajorVersion }} Paths
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
diff --git a/eng/scripts/appium-install.ps1 b/eng/scripts/appium-install.ps1
index 497dd1c68a7b..5b51933532c9 100644
--- a/eng/scripts/appium-install.ps1
+++ b/eng/scripts/appium-install.ps1
@@ -199,12 +199,13 @@ Write-Output "List of installed drivers after cleaup $drivers"
 Write-Output  "Check everything is installed correctly with appium doctor"
 
 if ($IsWindows) {
-    appium driver doctor windows || & { "ignore failure"; $global:LASTEXITCODE = 0 }
+    appium driver doctor windows
 }
 if ($IsMacOS) {
-    # appium driver doctor xcuitest || & { "ignore failure"; $global:LASTEXITCODE = 0 }
-    # appium driver doctor mac2 || & { "ignore failure"; $global:LASTEXITCODE = 0 }
+    appium driver doctor xcuitest
+    appium driver doctor mac2
 }
-appium driver doctor uiautomator2 || & { "ignore failure"; $global:LASTEXITCODE = 0 }
+
+appium driver doctor uiautomator2
 
 Write-Output  "Done, thanks!"