diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile
index f77c139342..297c406b7b 100644
--- a/scripts/build/Jenkins/Jenkinsfile
+++ b/scripts/build/Jenkins/Jenkinsfile
@@ -26,8 +26,7 @@ def pipelineParameters = [
     booleanParam(defaultValue: false, description: 'Deletes the contents of the output directory before building. This will cause a \"clean\" build. NOTE: does not imply CLEAN_ASSETS', name: 'CLEAN_OUTPUT_DIRECTORY'),
     booleanParam(defaultValue: false, description: 'Deletes the contents of the output directories of the AssetProcessor before building.', name: 'CLEAN_ASSETS'),
     booleanParam(defaultValue: false, description: 'Deletes the contents of the workspace and forces a complete pull.', name: 'CLEAN_WORKSPACE'),
-    booleanParam(defaultValue: false, description: 'Recreates the volume used for the workspace. The volume will be created out of a snapshot taken from main.', name: 'RECREATE_VOLUME'),
-    string(defaultValue: '', description: 'Filters and overrides the list of jobs to run for each of the below platforms (comma-separated). Can\'t be used during a pull request.', name: 'JOB_LIST_OVERRIDE')
+    booleanParam(defaultValue: false, description: 'Recreates the volume used for the workspace. The volume will be created out of a snapshot taken from main.', name: 'RECREATE_VOLUME')
 ]
 
 def palSh(cmd, lbl = '', winSlashReplacement = true) {
@@ -76,18 +75,22 @@ def palRmDir(path) {
     }
 }
 
-def IsJobEnabled(buildTypeMap, pipelineName, platformName) {
-    def job_list_override = params.JOB_LIST_OVERRIDE.tokenize(',')
+def IsPullRequest(branchName) {
+    // temporarily using the name to detect if we are in a PR
+    // In the future we will check with github
+    return branchName.startsWith('PR-')
+}
+
+def IsJobEnabled(branchName, buildTypeMap, pipelineName, platformName) {
+    if (IsPullRequest(branchName)) {
+        return buildTypeMap.value.TAGS && buildTypeMap.value.TAGS.contains(pipelineName)
+    }
+    def job_list_override = params.JOB_LIST_OVERRIDE ? params.JOB_LIST_OVERRIDE.tokenize(',') : ''
     if (!job_list_override.isEmpty()) {
         return params[platformName] && job_list_override.contains(buildTypeMap.key);
     } else {
-        if (params[platformName]) {
-            if(buildTypeMap.value.TAGS) {
-                return buildTypeMap.value.TAGS.contains(pipelineName)
-            }
-        }
+        return params[platformName] && buildTypeMap.value.TAGS && buildTypeMap.value.TAGS.contains(pipelineName)
     }
-    return false
 }
 
 def GetRunningPipelineName(JENKINS_JOB_NAME) {
@@ -448,8 +451,12 @@ try {
                     pipelineConfig = LoadPipelineConfig(pipelineName, branchName)
 
                     // Add each platform as a parameter that the user can disable if needed
-                    pipelineConfig.platforms.each { platform ->
-                        pipelineParameters.add(booleanParam(defaultValue: true, description: '', name: platform.key))
+                    if (!IsPullRequest(branchName)) {
+                        pipelineParameters.add(stringParam(defaultValue: '', description: 'Filters and overrides the list of jobs to run for each of the below platforms (comma-separated). Can\'t be used during a pull request.', name: 'JOB_LIST_OVERRIDE'))
+
+                        pipelineConfig.platforms.each { platform ->
+                            pipelineParameters.add(booleanParam(defaultValue: true, description: '', name: platform.key))
+                        }
                     }
                     pipelineProperties.add(parameters(pipelineParameters))
                     properties(pipelineProperties)
@@ -462,7 +469,7 @@ try {
         }
     }
 
-    if(env.BUILD_NUMBER == '1' && !branchName.startsWith('PR-')) {
+    if(env.BUILD_NUMBER == '1' && !IsPullRequest(branchName)) {
         // Exit pipeline early on the intial build. This allows Jenkins to load the pipeline for the branch and enables users
         // to select build parameters on their first actual build. See https://issues.jenkins.io/browse/JENKINS-41929
         currentBuild.result = 'SUCCESS'
@@ -477,7 +484,7 @@ try {
     // Platform Builds run on EC2
     pipelineConfig.platforms.each { platform ->
         platform.value.build_types.each { build_job ->
-            if (IsJobEnabled(build_job, pipelineName, platform.key)) {   // User can filter jobs, jobs are tagged by pipeline
+            if (IsJobEnabled(branchName, build_job, pipelineName, platform.key)) {   // User can filter jobs, jobs are tagged by pipeline
                 def envVars = GetBuildEnvVars(platform.value.PIPELINE_ENV ?: EMPTY_JSON, build_job.value.PIPELINE_ENV ?: EMPTY_JSON, pipelineName)
                 envVars['JOB_NAME'] = "${branchName}_${platform.key}_${build_job.key}" // backwards compatibility, some scripts rely on this
                 def nodeLabel = envVars['NODE_LABEL']