diff --git a/craft-cache/stable-pipelines/linux.pipeline b/craft-cache/stable-pipelines/linux.pipeline
index 357074c..bd8a02d 100644
--- a/craft-cache/stable-pipelines/linux.pipeline
+++ b/craft-cache/stable-pipelines/linux.pipeline
@@ -1,51 +1,51 @@
 // Request a node to be allocated to us
 node( "Ubuntu1604Craft" ) {
 // We want Timestamps on everything
 timestamps {
 	// We want to catch any errors that occur to allow us to send out notifications (ie. emails) if needed
 	catchError {
 
 		// First we want to make sure Craft is ready to go
 		stage('Preparing Craft') {
 			// Grab our tooling which we will need in a few moments
 			checkout changelog: false, poll: false, scm: [
 				$class: 'GitSCM',
 				branches: [[name: 'master']],
 				extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'bf-tooling/']],
 				userRemoteConfigs: [[url: 'https://anongit.kde.org/sysadmin/binary-factory-tooling']]
 			]
 
 			// We are also reliant on the CI System Tooling for parts of this, so grab it too
 			checkout changelog: false, poll: false, scm: [
 				$class: 'GitSCM',
 				branches: [[name: 'master']],
 				extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'ci-tooling/']],
 				userRemoteConfigs: [[url: 'https://anongit.kde.org/sysadmin/ci-tooling']]
 			]
 
 			// Make sure that Craftmaster is ready to go
 			sh """
 				python3 "$WORKSPACE/bf-tooling/craft/checkout-repository.py" --repository "git://anongit.kde.org/craftmaster" --into ~/Craft/BinaryCache/ --branch stable
 			"""
 		}
 
 		// Now that is done, it's time to rebuild the Craft Cache!
 		stage('Build Craft Cache') {
 			sh """
 				cd ~/Craft/BinaryCache/craftmaster/
 				python3.6 CraftMaster.py --config config/CraftBinaryCache.ini --target ${craftPlatform} --variables CreateCache=True UseCache=True -c -i craft
-				python3.6 CraftMaster.py --config config/CraftBinaryCache.ini --target ${craftPlatform} --variables CreateCache=True UseCache=True -c --option "/.buildTests=False" --option "[ContinuousIntegration]ClearBuildFolder=False" --list-file config/BinaryCachePackages.list
+				python3.6 CraftMaster.py --config config/CraftBinaryCache.ini --target ${craftPlatform} --variables CreateCache=True UseCache=True -c --option "/.buildTests=False" --list-file config/BinaryCachePackages.list
 			"""
 		}
 
 	}
 
     // And finally, we'll upload it to the master server
     stage('Publish Craft Cache') {
         sh """
             cd "$WORKSPACE/ci-tooling/"
             python3 helpers/sftp-directory-mirror.py --source ~/Craft/BinaryCache/cache/ --destination /srv/archives/files/craft/master/ --server racnoss.kde.org --username craft
         """
     }
 }
 }
diff --git a/craft-cache/stable-pipelines/macos.pipeline b/craft-cache/stable-pipelines/macos.pipeline
index 905d9a6..be7e1bc 100644
--- a/craft-cache/stable-pipelines/macos.pipeline
+++ b/craft-cache/stable-pipelines/macos.pipeline
@@ -1,68 +1,68 @@
 // Request a node to be allocated to us
 node( "macOS" ) {
 // We want Timestamps on everything
 timestamps {
 	// We want to catch any errors that occur to allow us to send out notifications (ie. emails) if needed
 	catchError {
 
 		// First we want to make sure Craft is ready to go
 		stage('Preparing Craft') {
 			// Make sure we start with a clean slate
 			deleteDir()
 
 			// Grab our tooling which we will need in a few moments
 			checkout changelog: false, poll: false, scm: [
 				$class: 'GitSCM',
 				branches: [[name: 'master']],
 				extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'bf-tooling/']],
 				userRemoteConfigs: [[url: 'https://anongit.kde.org/sysadmin/binary-factory-tooling']]
 			]
 
 			// We are also reliant on the CI System Tooling for parts of this, so grab it too
 			checkout changelog: false, poll: false, scm: [
 				$class: 'GitSCM',
 				branches: [[name: 'master']],
 				extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'ci-tooling/']],
 				userRemoteConfigs: [[url: 'https://anongit.kde.org/sysadmin/ci-tooling']]
 			]
 
 			// Make sure that Craftmaster is ready to go
 			sh """
 				/usr/local/bin/python3 "$WORKSPACE/bf-tooling/craft/checkout-repository.py" --repository "git://anongit.kde.org/craftmaster" --into ~/Craft/BinaryCache/ --branch stable
 			"""
 		}
 
 		// Now that is done, it's time to rebuild the Craft Cache!
 		stage('Build Craft Cache') {
 			sh """
 				cd ~/Craft/BinaryCache/craftmaster/
 				/usr/local/bin/python3 Craftmaster.py --config config/CraftBinaryCache.ini --target ${craftPlatform} --variables CreateCache=True UseCache=True -c -i craft
-				/usr/local/bin/python3 Craftmaster.py --config config/CraftBinaryCache.ini --target ${craftPlatform} --variables CreateCache=True UseCache=True -c --option "/.buildTests=False" --option "[ContinuousIntegration]ClearBuildFolder=False" --list-file config/BinaryCachePackages.list
+				/usr/local/bin/python3 Craftmaster.py --config config/CraftBinaryCache.ini --target ${craftPlatform} --variables CreateCache=True UseCache=True -c --option "/.buildTests=False" --list-file config/BinaryCachePackages.list
 			"""
 		}
 	}
 
 	// We need to catch errors here to ensure that the cleanup always runs, even if the upload fails
 	// While this is a bit wasteful it at least determines that errors in the publishing process leave a builder with a very full disk!
 	catchError {
 		// And finally, we'll upload it to the master server
 		stage('Publish Craft Cache') {
 			sh """
 				cd "$WORKSPACE/ci-tooling/"
 				/usr/local/bin/python3 helpers/sftp-directory-mirror.py --source ~/Craft/BinaryCache/cache/ --destination /srv/archives/files/craft/master/ --server racnoss.kde.org --username craft
 			"""
 		}
 	}
 
 
 	// Then we can cleanup everything we did
 	stage('Cleaning Up') {
 		sh """
 			rm -rf ~/Craft/BinaryCache/
 		"""
 	}
 
 	// As the macOS Slaves are permanent ones, we erase the Workspace as the last thing we do
 	deleteDir()
 }
 }
diff --git a/craft-cache/stable-pipelines/windows.pipeline b/craft-cache/stable-pipelines/windows.pipeline
index 0c45c3a..e82dc9b 100644
--- a/craft-cache/stable-pipelines/windows.pipeline
+++ b/craft-cache/stable-pipelines/windows.pipeline
@@ -1,68 +1,68 @@
 // Request a node to be allocated to us
 node( "WindowsMSVC" ) {
 // We want Timestamps on everything
 timestamps {
 	// We want to catch any errors that occur to allow us to send out notifications (ie. emails) if needed
 	catchError {
 
 		// First we want to make sure Craft is ready to go
 		stage('Preparing Craft') {
 			// Make sure we start with a clean slate
 			deleteDir()
 
 			// Grab our tooling which we will need in a few moments
 			checkout changelog: false, poll: false, scm: [
 				$class: 'GitSCM',
 				branches: [[name: 'master']],
 				extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'bf-tooling/']],
 				userRemoteConfigs: [[url: 'https://anongit.kde.org/sysadmin/binary-factory-tooling']]
 			]
 
 			// We are also reliant on the CI System Tooling for parts of this, so grab it too
 			checkout changelog: false, poll: false, scm: [
 				$class: 'GitSCM',
 				branches: [[name: 'master']],
 				extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'ci-tooling/']],
 				userRemoteConfigs: [[url: 'https://anongit.kde.org/sysadmin/ci-tooling']]
 			]
 
 			// Make sure that Craftmaster is ready to go
 			bat """
 				python "%WORKSPACE%\\bf-tooling\\craft\\checkout-repository.py" --repository "git://anongit.kde.org/craftmaster" --into "C:/Craft/BinaryCache/" --branch stable
 			"""
 		}
 
 		// Now that is done, it's time to rebuild the Craft Cache!
 		stage('Build Craft Cache') {
 			bat """
 				cd C:/Craft/BinaryCache/craftmaster/
 				python Craftmaster.py --config config/CraftBinaryCache.ini --target ${craftPlatform} --variables CreateCache=True UseCache=True -c -i craft
-				python Craftmaster.py --config config/CraftBinaryCache.ini --target ${craftPlatform} --variables CreateCache=True UseCache=True -c --option "/.buildTests=False" --option "[ContinuousIntegration]ClearBuildFolder=False" --list-file config/BinaryCachePackages.list
+				python Craftmaster.py --config config/CraftBinaryCache.ini --target ${craftPlatform} --variables CreateCache=True UseCache=True -c --option "/.buildTests=False" --list-file config/BinaryCachePackages.list
 			"""
 		}
 	}
 
 	// We need to catch errors here to ensure that the cleanup always runs, even if the upload fails
 	// While this is a bit wasteful it at least determines that errors in the publishing process leave a builder with a very full disk!
 	catchError {
 		// Upload it to the master server
 		stage('Publish Craft Cache') {
 			bat """
 				cd "%WORKSPACE%\\ci-tooling"
 				python helpers/sftp-directory-mirror.py --source C:/Craft/BinaryCache/cache/ --destination /srv/archives/files/craft/master/ --server racnoss.kde.org --username craft
 			"""
 		}
 	}
 
 	// Then we can cleanup everything we did
 	// It is critical this always happens, otherwise builders can run out of disk space!
 	stage('Cleaning Up') {
 		bat """
 			rmdir /s /q C:\\Craft\\BinaryCache\\
 		"""
 	}
 
 	// As the Windows Slaves are permanent ones, we erase the Workspace as the last thing we do
 	deleteDir()
 }
 }