Index: Jenkins/FullBuild
===================================================================
--- Jenkins/FullBuild	(revision e6d8d114c2f1a34e88d1f6cc47ad26c7792f201a)
+++ Jenkins/FullBuild	(revision 985b6245b5f32f78740a4e3b173e26ac0f687e1a)
@@ -20,9 +20,10 @@
 					gcc_08_x86_new: { trigger_build( 'gcc-10',  'x86', false ) },
 					gcc_07_x86_new: { trigger_build( 'gcc-9',   'x86', false ) },
+					gcc_11_x64_new: { trigger_build( 'gcc-11',  'x64', false ) },
 					gcc_10_x64_new: { trigger_build( 'gcc-10',  'x64', false ) },
 					gcc_09_x64_new: { trigger_build( 'gcc-9',   'x64', false ) },
 					gcc_08_x64_new: { trigger_build( 'gcc-8',   'x64', false ) },
 					gcc_07_x64_new: { trigger_build( 'gcc-7',   'x64', false ) },
-					gcc_06_x64_new: { trigger_build( 'gcc-6',   'x64', false ) },
+					// gcc_06_x64_new: { trigger_build( 'gcc-6',   'x64', false ) },
 					clang_x64_new:  { trigger_build( 'clang',   'x64', true  ) },
 				)
@@ -41,6 +42,6 @@
 	}
 
-	//If an exception is caught we need to change the status and remember to
-	//attach the build log to the email
+	// If an exception is caught we need to change the status and remember to
+	// attach the build log to the email
 	catch (Exception caughtError) {
 		echo('error caught')
@@ -73,5 +74,5 @@
 	// Run the build
 	// Don't propagate, it doesn't play nice with our email setup
-	def result = build job: 'Cforall/master', 		\
+	def result = build job: 'Cforall/master', 			\
 		parameters: [						\
 			[$class: 'StringParameterValue', 		\
@@ -83,21 +84,21 @@
 			[$class: 'BooleanParameterValue', 		\
 			  name: 'NewAST', 				\
-			  value: true], 					\
+			  value: true], 				\
 			[$class: 'BooleanParameterValue', 		\
 			  name: 'RunAllTests', 				\
-			  value: true], 					\
+			  value: true], 				\
 			[$class: 'BooleanParameterValue', 		\
 			  name: 'RunBenchmark', 			\
-			  value: true], 					\
+			  value: true], 				\
 			[$class: 'BooleanParameterValue', 		\
-			  name: 'BuildDocumentation', 		\
+			  name: 'BuildDocumentation', 			\
 			  value: doc], 					\
 			[$class: 'BooleanParameterValue', 		\
 			  name: 'Publish', 				\
-			  value: true], 					\
+			  value: true], 				\
 			[$class: 'BooleanParameterValue', 		\
 			  name: 'Silent', 				\
-			  value: true], 					\
-		],								\
+			  value: true], 				\
+		],							\
 		propagate: false
 
@@ -111,9 +112,9 @@
 
 def trigger_dist(String commitId, String buildNum) {
-	def result = build job: 'Cforall_Distribute_Ref',	\
+	def result = build job: 'Cforall_Distribute_Ref',		\
 		parameters: [						\
 			string(name: 'GitRef', value: commitId),	\
-			string(name: 'Build' , value: buildNum)	\
-		],								\
+			string(name: 'Build' , value: buildNum)		\
+		],							\
 		propagate: false
 
Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision e6d8d114c2f1a34e88d1f6cc47ad26c7792f201a)
+++ Jenkinsfile	(revision 985b6245b5f32f78740a4e3b173e26ac0f687e1a)
@@ -305,13 +305,13 @@
 				this.Compiler = new CC_Desc('gcc-7', 'g++-7', 'gcc-7', '-flto=auto')
 			break
-			case 'gcc-6':
-				this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6', '-flto=auto')
-			break
-			case 'gcc-5':
-				this.Compiler = new CC_Desc('gcc-5', 'g++-5', 'gcc-5', '-flto=auto')
-			break
-			case 'gcc-4.9':
-				this.Compiler = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9', '-flto=auto')
-			break
+			// case 'gcc-6':
+			//	this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6', '-flto=auto')
+			// break
+			// case 'gcc-5':
+			//	this.Compiler = new CC_Desc('gcc-5', 'g++-5', 'gcc-5', '-flto=auto')
+			// break
+			// case 'gcc-4.9':
+			//	this.Compiler = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9', '-flto=auto')
+			// break
 			case 'clang':
 				this.Compiler = new CC_Desc('clang', 'clang++-10', 'gcc-10', '-flto=thin -flto-jobs=0')
@@ -359,52 +359,54 @@
 def prepare_build() {
 	// prepare the properties
-	properties ([ 													\
-		buildDiscarder(logRotator(										\
-			artifactDaysToKeepStr: '',									\
-			artifactNumToKeepStr: '',									\
-			daysToKeepStr: '730',										\
-			numToKeepStr: '1000'										\
-		)),														\
-		[$class: 'ParametersDefinitionProperty', 								\
-			parameterDefinitions: [ 									\
-				[$class: 'ChoiceParameterDefinition',						\
-					description: 'Which compiler to use',					\
-					name: 'Compiler',									\
-					choices: 'gcc-11\ngcc-10\ngcc-9\ngcc-8\ngcc-7\ngcc-6\ngcc-5\ngcc-4.9\nclang',	\
-					defaultValue: 'gcc-8',								\
-				],												\
-				[$class: 'ChoiceParameterDefinition',						\
-					description: 'The target architecture',					\
-					name: 'Architecture',								\
-					choices: 'x64\nx86',								\
-					defaultValue: 'x64',								\
-				],												\
-				[$class: 'BooleanParameterDefinition',  						\
+	properties ([ 										\
+		buildDiscarder(logRotator(							\
+			artifactDaysToKeepStr: '',						\
+			artifactNumToKeepStr: '',						\
+			daysToKeepStr: '730',							\
+			numToKeepStr: '1000'							\
+		)),										\
+		[$class: 'ParametersDefinitionProperty', 					\
+			parameterDefinitions: [ 						\
+				[$class: 'ChoiceParameterDefinition',				\
+					description: 'Which compiler to use',			\
+					name: 'Compiler',					\
+					choices: 'gcc-11\ngcc-10\ngcc-9\ngcc-8\ngcc-7\nclang',	\
+					defaultValue: 'gcc-9',					\
+				],								\
+				[$class: 'ChoiceParameterDefinition',				\
+					description: 'The target architecture',			\
+					name: 'Architecture',					\
+					choices: 'x64\nx86',					\
+					defaultValue: 'x64',					\
+				],								\
+				[$class: 'BooleanParameterDefinition',  			\
 					description: 'If false, the test suite is only ran in debug', 	\
-					name: 'RunAllTests', 								\
-					defaultValue: false,  								\
-				], 												\
-				[$class: 'BooleanParameterDefinition',  						\
-					description: 'If true, jenkins also runs benchmarks', 		\
-					name: 'RunBenchmark', 								\
-					defaultValue: false,  								\
-				], 												\
-				[$class: 'BooleanParameterDefinition',  						\
-					description: 'If true, jenkins also builds documentation', 		\
-					name: 'BuildDocumentation', 							\
-					defaultValue: true,  								\
-				],												\
-				[$class: 'BooleanParameterDefinition',  						\
-					description: 'If true, jenkins also publishes results', 		\
-					name: 'Publish', 									\
-					defaultValue: false,  								\
-				],												\
-				[$class: 'BooleanParameterDefinition',  						\
-					description: 'If true, jenkins will not send emails', 		\
-					name: 'Silent', 									\
-					defaultValue: false,  								\
-				],												\
+					name: 'RunAllTests', 					\
+					defaultValue: false,  					\
+				], 								\
+				[$class: 'BooleanParameterDefinition',  			\
+					description: 'If true, jenkins also runs benchmarks', 	\
+					name: 'RunBenchmark', 					\
+					defaultValue: false,  					\
+				], 								\
+				[$class: 'BooleanParameterDefinition',  			\
+					description: 'If true, jenkins also builds documentation', \
+					name: 'BuildDocumentation', 				\
+					defaultValue: true,  					\
+				],								\
+				[$class: 'BooleanParameterDefinition',  			\
+					description: 'If true, jenkins also publishes results', \
+					name: 'Publish', 					\
+					defaultValue: false,  					\
+				],								\
+				[$class: 'BooleanParameterDefinition',  			\
+					description: 'If true, jenkins will not send emails', 	\
+					name: 'Silent', 					\
+					defaultValue: false,  					\
+				],								\
 			],
 		]])
+					// choices: 'gcc-11\ngcc-10\ngcc-9\ngcc-8\ngcc-7\ngcc-6\ngcc-5\ngcc-4.9\nclang',
+					// defaultValue: 'gcc-8',
 
 	// It's unfortunate but it looks like we need to checkout the entire repo just to get