diff --git a/.github/config/nodejs-dev.jsonc b/.github/config/nodejs-dev.jsonc
index c8ca78b18b..de23fa82eb 100644
--- a/.github/config/nodejs-dev.jsonc
+++ b/.github/config/nodejs-dev.jsonc
@@ -117,6 +117,7 @@
     "datacatalog/quickstart",
     "datacatalog/snippets",
     "datalabeling",
+    "dataproc",
     "dialogflow",
     "discoveryengine",
     "document-warehouse",
diff --git a/.github/config/nodejs.jsonc b/.github/config/nodejs.jsonc
index b8bc67ffcb..421a0107ba 100644
--- a/.github/config/nodejs.jsonc
+++ b/.github/config/nodejs.jsonc
@@ -79,7 +79,6 @@
     "automl", // (untested) FAILED_PRECONDITION: Google Cloud AutoML Natural Language was retired on March 15, 2024. Please migrate to Vertex AI instead
     "cloud-sql/sqlserver/tedious", // (untested) TypeError: The "config.server" property is required and must be of type string.
     "compute", // GoogleError: The resource 'projects/long-door-651/zones/us-central1-a/disks/disk-from-pool-name' was not found
-    "dataproc", // GoogleError: Error submitting create cluster request: Multiple validation errors
     "datastore/functions", // [ERR_REQUIRE_ESM]: require() of ES Module
     "dialogflow-cx", // NOT_FOUND: com.google.apps.framework.request.NotFoundException: Agent 'undefined' does not exist
     "dlp", // [ERR_REQUIRE_ESM]: require() of ES Module
diff --git a/.github/workflows/dataproc.yaml b/.github/workflows/dataproc.yaml
deleted file mode 100644
index 88e47368b2..0000000000
--- a/.github/workflows/dataproc.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2023 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: dataproc
-on:
-  push:
-    branches:
-    - main
-    paths:
-    - 'dataproc/**'
-    - '.github/workflows/dataproc.yaml'
-    - '.github/workflows/test.yaml'
-  pull_request:
-    types:
-    - opened
-    - reopened
-    - synchronize
-    - labeled
-    paths:
-    - 'dataproc/**'
-    - '.github/workflows/dataproc.yaml'
-    - '.github/workflows/test.yaml'
-  schedule:
-  - cron: '0 0 * * 0'
-jobs:
-  test:
-    permissions:
-      contents: 'read'
-      id-token: 'write'
-    if: github.event.action != 'labeled' || github.event.label.name == 'actions:force-run'
-    uses: ./.github/workflows/test.yaml
-    with:
-      name: 'dataproc'
-      path: 'dataproc'
-  flakybot:
-    permissions:
-      contents: 'read'
-      id-token: 'write'
-    if: github.event_name == 'schedule' && always() # always() submits logs even if tests fail
-    uses: ./.github/workflows/flakybot.yaml
-    needs: [test]
diff --git a/dataproc/system-test/createCluster.test.js b/dataproc/system-test/createCluster.test.js
index 6d6aad852a..b53f66a841 100644
--- a/dataproc/system-test/createCluster.test.js
+++ b/dataproc/system-test/createCluster.test.js
@@ -19,7 +19,7 @@ const {describe, it, after} = require('mocha');
 const cp = require('child_process');
 const {v4} = require('uuid');
 
-const region = 'us-central1';
+const region = 'us-west1';
 const clusterName = `node-cc-test-${v4()}`;
 
 const dataproc = require('@google-cloud/dataproc');
@@ -27,7 +27,7 @@ const clusterClient = new dataproc.v1.ClusterControllerClient({
   apiEndpoint: `${region}-dataproc.googleapis.com`,
 });
 
-const projectId = process.env.GCLOUD_PROJECT;
+const projectId = process.env.PROJECT_ID;
 
 const execSync = cmd =>
   cp.execSync(cmd, {
diff --git a/dataproc/system-test/instantiateInlineWorkflowTemplate.test.js b/dataproc/system-test/instantiateInlineWorkflowTemplate.test.js
index f1669b2d50..0aa5789fd6 100644
--- a/dataproc/system-test/instantiateInlineWorkflowTemplate.test.js
+++ b/dataproc/system-test/instantiateInlineWorkflowTemplate.test.js
@@ -18,7 +18,7 @@ const {assert} = require('chai');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 
-const projectId = process.env.GCLOUD_PROJECT;
+const projectId = process.env.PROJECT_ID;
 const region = 'us-central1';
 
 const execSync = cmd =>
diff --git a/dataproc/system-test/quickstart.test.js b/dataproc/system-test/quickstart.test.js
index 56c1b29963..0859717f86 100644
--- a/dataproc/system-test/quickstart.test.js
+++ b/dataproc/system-test/quickstart.test.js
@@ -26,7 +26,7 @@ const myUuid = v4();
 const region = 'us-central1';
 const clusterName = `node-qs-test-${myUuid}`;
 const bucketName = `node-dataproc-qs-test-${myUuid}`;
-const projectId = process.env.GCLOUD_PROJECT;
+const projectId = process.env.PROJECT_ID;
 const jobFileName = 'sum.py';
 const jobFilePath = `gs://${bucketName}/${jobFileName}`;
 const sortCode =
diff --git a/dataproc/system-test/submitJob.test.js b/dataproc/system-test/submitJob.test.js
index e62c29e1b5..51a3c93a79 100644
--- a/dataproc/system-test/submitJob.test.js
+++ b/dataproc/system-test/submitJob.test.js
@@ -19,7 +19,7 @@ const {describe, it, before, after} = require('mocha');
 const cp = require('child_process');
 const {v4} = require('uuid');
 
-const projectId = process.env.GCLOUD_PROJECT;
+const projectId = process.env.PROJECT_ID;
 const region = 'us-central1';
 const clusterName = `node-sj-test-${v4()}`;
 const cluster = {