diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 443e05d44e..aa3b010076 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -26,7 +26,7 @@ on:
     paths-ignore:
       - '**.md'
       - '.*'
-  pull_request_target:
+  pull_request:
     paths-ignore:
       - '**.md'
 
diff --git a/.github/workflows/helm-chart-test.yml b/.github/workflows/helm-chart-test.yml
index d77ad16fc5..5ce3c63e77 100644
--- a/.github/workflows/helm-chart-test.yml
+++ b/.github/workflows/helm-chart-test.yml
@@ -170,7 +170,7 @@ jobs:
           retry_wait_seconds: 60
           command: NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
       - name: Login Docker Hub
-        run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+        run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" || true
         env:
           DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
           DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
diff --git a/Video/video.sh b/Video/video.sh
index cdb43245cb..2901f82b47 100755
--- a/Video/video.sh
+++ b/Video/video.sh
@@ -22,11 +22,11 @@ ts_format=${SE_LOG_TIMESTAMP_FORMAT:-"%Y-%m-%d %H:%M:%S,%3N"}
 process_name="video.recorder"
 
 if [ "${SE_VIDEO_RECORD_STANDALONE}" = "true" ]; then
-  JQ_SESSION_ID_QUERY=".value.nodes[-1]?.slots[-1]?.session?.sessionId"
+  JQ_SESSION_ID_QUERY=".value.nodes[]?.slots[]?.session?.sessionId"
   SE_NODE_PORT=${SE_NODE_PORT:-"4444"}
   NODE_STATUS_ENDPOINT="$(/opt/bin/video_gridUrl.sh)/status"
 else
-  JQ_SESSION_ID_QUERY=".[-1]?.node?.slots | .[-1]?.session?.sessionId"
+  JQ_SESSION_ID_QUERY=".[]?.node?.slots | .[0]?.session?.sessionId"
   SE_NODE_PORT=${SE_NODE_PORT:-"5555"}
   NODE_STATUS_ENDPOINT="${SE_SERVER_PROTOCOL}://${DISPLAY_CONTAINER_NAME}:${SE_NODE_PORT}/status"
 fi
@@ -259,7 +259,7 @@ else
       fi
       echo "$(date -u +"${ts_format}") [${process_name}] - Video recording started"
       sleep ${poll_interval}
-    elif [[ "$recording_started" = "true" && ("$session_id" != "$prev_session_id" || "$session_id" == "null" || "$session_id" == "") ]]; then
+    elif [[ "$session_id" != "$prev_session_id" && "$recording_started" = "true" ]]; then
       stop_recording
       wait_for_file_integrity
       if [[ $max_recorded_count -gt 0 ]] && [[ $recorded_count -ge $max_recorded_count ]]; then
diff --git a/Video/video_graphQLQuery.sh b/Video/video_graphQLQuery.sh
index 9723c01f04..a10d99e99c 100755
--- a/Video/video_graphQLQuery.sh
+++ b/Video/video_graphQLQuery.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 max_time=1
-retry_time=2
+retry_time=3
 
 # Define parameters
 SESSION_ID=$1