diff --git a/.gitlab/end_to_end.yml b/.gitlab/end_to_end.yml
index ea3ef82a8..015c8bf1f 100644
--- a/.gitlab/end_to_end.yml
+++ b/.gitlab/end_to_end.yml
@@ -444,15 +444,18 @@ end_to_end_web_test:
     - cmake --build build --target end_to_end_web_tests
 
 end_to_end_error_discovery_arango:
+  needs: ["check-ci-infrastructure", "end-to-end-arango-setup"]
   stage: log
   tags:
     - ci-datafed-arango
   script:
     - sudo journalctl --no-pager -u arangodb3.service
   rules:
-    - when: always
+    - job: check-ci-infrastructure
+      when: on_success
 
 end_to_end_error_discovery_gcs:
+  needs: ["check-ci-infrastructure", "end-to-end-gcs-authz-setup"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
@@ -460,8 +463,12 @@ end_to_end_error_discovery_gcs:
   tags:
     - ci-datafed-globus
     - docker
+  rules:
+    - job: check-ci-infrastructure
+      when: on_success
 
 end_to_end_error_discovery_repo:
+  needs: ["check-ci-infrastructure", "end-to-end-repo-setup"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
@@ -469,8 +476,12 @@ end_to_end_error_discovery_repo:
   tags:
     - ci-datafed-globus
     - docker
+  rules:
+    - job: check-ci-infrastructure
+      when: on_success
 
 end_to_end_error_discovery_core:
+  needs: ["check-ci-infrastructure", "end-to-end-core-setup"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
@@ -478,8 +489,12 @@ end_to_end_error_discovery_core:
   tags:
     - ci-datafed-core
     - docker
+  rules:
+    - job: check-ci-infrastructure
+      when: on_success
 
 end_to_end_error_discovery_web:
+  needs: ["check-ci-infrastructure", "end-to-end-ws-setup"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
@@ -487,3 +502,6 @@ end_to_end_error_discovery_web:
   tags:
     - ci-datafed-core
     - docker
+  rules:
+    - job: check-ci-infrastructure
+      when: on_success
diff --git a/external/protobuf b/external/protobuf
index a9b006bdd..63def39e8 160000
--- a/external/protobuf
+++ b/external/protobuf
@@ -1 +1 @@
-Subproject commit a9b006bddd52e289029f16aa77b77e8e0033d9ee
+Subproject commit 63def39e881afa496502d9c410f4ea948e59490d
diff --git a/scripts/ci_pipeline_setup.sh b/scripts/ci_pipeline_setup.sh
index 8621f1046..94ffd3be9 100755
--- a/scripts/ci_pipeline_setup.sh
+++ b/scripts/ci_pipeline_setup.sh
@@ -26,7 +26,6 @@ Help()
   echo "-a, --gitlab-api-token            The GitLab API token for checking the"
   echo "                                  status of a pipeline."
 }
-
 GITLAB_PROJECT_ID="10830"
 
 OS_APP_ID=$(printenv OS_APP_ID || true)
@@ -145,7 +144,7 @@ data=$(curl -s --retry 5 -i -X POST \
         }
     }" \
       https://orc-open.ornl.gov:13000/v3/auth/tokens) 
-error_code=$?
+error_code="$?"
 if [ "$error_code" == "6" ]
 then
   echo "Unable to connect to Open Stack API endpoints, make sure you are"
@@ -226,17 +225,20 @@ find_orc_instance_by_name() {
     found_vm_id="TRUE"
   fi
 }
+body=$(echo "$data" | sed -n 's/^\({\".*\)/\1/p')
 
-body=$(echo $data | sed 's/^.*{\"token/{\"token/' )
+if jq -e 'has("error")' <<< "$body" > /dev/null; then
+    echo "Error Detected!"
+    echo "$body" | jq
+    exit 2
+fi
 
 compute_url=$(echo "$body" | jq '.token.catalog[] | select(.name=="nova") |.endpoints[] | select(.interface=="public") | .url ')
 sanitize_compute_url=$(echo $compute_url | sed 's/\"//g')
 header=$(echo "$data" | sed 's/{\"token.*//')
 subject_token=$(echo "$data" | grep "X-Subject-Token" | awk '{print $2}' )
-
 sanitize_subject_token=${subject_token:0:268}
 
-
 ################################################################################
 # Check 1 - Are there running pipelines
 ################################################################################