diff --git a/custom-jobs/krita/Krita_Nightly_Android_Build.pipeline b/custom-jobs/krita/Krita_Nightly_Android_Build.pipeline
index bb54298..534a58c 100644
--- a/custom-jobs/krita/Krita_Nightly_Android_Build.pipeline
+++ b/custom-jobs/krita/Krita_Nightly_Android_Build.pipeline
@@ -1,83 +1,83 @@
 // Request a node to be allocated to us
 node( "AndroidSDK" ) {
 // 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 Thing: Checkout Sources
 		stage('Checkout Sources') {
 			// Make sure we have a clean slate to begin with
 			deleteDir()
 
 			// Krita Code
 			checkout changelog: true, poll: true, scm: [
 				$class: 'GitSCM',
 				branches: [[name: 'master']],
 				extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'krita/']],
 				userRemoteConfigs: [[url: 'https://anongit.kde.org/krita']]
 			]
 
 		}
 
 		// Now retrieve the artifacts
 		stage('Retrieving Dependencies') {
 			// First we grab the artifacted dependencies built last time round
 			copyArtifacts filter: 'krita-android-deps.tar', projectName: 'Krita_Nightly_Android_Dependency_Build'
 
 			// Now we unpack them
 			sh """
 				tar -xf $WORKSPACE/krita-android-deps.tar
 			"""
 		}
 
 		// Make sure the Android SDK is setup properly
 		stage('Setting up SDK') {
 			// For this we need to ensure that the Android 24 or later SDK is installed, otherwise the APK generation will fail
 			sh """
 				sdkmanager "platforms;android-28"
-				sdkmanager "ndk;21.0.6113669"
+				sdkmanager "ndk;18.1.5063045"
 			"""
 		}
 
 		// Let's build Krita that we have everything we need
 		stage('Building Krita') {
 			// The first parameter to the script is where the scripts should work - which is our workspace in this case
 			// Otherwise we leave everything in the hands of that script
 			sh """
 				unset QT_ANDROID
 				unset QMAKESPEC
 				
 				export ANDROID_ABI=arm64-v8a
 				export ANDROID_API_LEVEL=28
-				export CMAKE_ANDROID_NDK=$ANDROID_SDK_ROOT/ndk/21.0.6113669/
+				export CMAKE_ANDROID_NDK=$ANDROID_SDK_ROOT/ndk/18.1.5063045/
 
 				krita/packaging/android/androidbuild.sh --src=$WORKSPACE/krita/ --build-type=Release --build-root=$WORKSPACE/build/ -p=krita-bin
 			"""
 		}
 
 		// Now we can generate the actual APKs!
 		stage('Generating Krita APK') {
 			// The scripts handle everything here, so just run them
 			sh """
 				unset QT_ANDROID
 				unset QMAKESPEC
 				
 				export ANDROID_ABI=arm64-v8a
 				export ANDROID_API_LEVEL=28
 				export CMAKE_ANDROID_NDK=$ANDROID_NDK_ROOT
 
 				krita/packaging/android/androidbuild.sh --src=$WORKSPACE/krita/ --build-type=Release --build-root=$WORKSPACE/build/ -p=apk
 				
 				mv $WORKSPACE/build/krita_build_apk/build/outputs/apk/*/*.apk ./
 			"""
 		}
 
 		// Finally we capture the APKs for distribution to users
 		stage('Capturing APKs') {
 			// We use Jenkins artifacts for this to save having to setup additional infrastructure
 			archiveArtifacts artifacts: '*.apk', onlyIfSuccessful: true
 		}
 	}
 }
 }
diff --git a/custom-jobs/krita/Krita_Nightly_Android_Dependency_Build.pipeline b/custom-jobs/krita/Krita_Nightly_Android_Dependency_Build.pipeline
index 46402a8..4d83ef2 100644
--- a/custom-jobs/krita/Krita_Nightly_Android_Dependency_Build.pipeline
+++ b/custom-jobs/krita/Krita_Nightly_Android_Dependency_Build.pipeline
@@ -1,64 +1,64 @@
 // Request a node to be allocated to us
 node( "AndroidSDK" ) {
 // 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 Thing: Checkout Sources
 		stage('Checkout Sources') {
 			// Make sure we have a clean slate to begin with
 			deleteDir()
 
 			// Krita Code
 			checkout changelog: true, poll: true, scm: [
 				$class: 'GitSCM',
 				branches: [[name: 'master']],
 				extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'krita/']],
 				userRemoteConfigs: [[url: 'https://anongit.kde.org/krita']]
 			]
 
 		}
 
 		// Make sure the Android SDK is setup properly
 		stage('Setting up SDK') {
 			// For this we need to ensure that the Android 24 or later SDK is installed, otherwise the APK generation will fail
 			sh """
 				sdkmanager "platforms;android-28"
-				sdkmanager "ndk;21.0.6113669"
+				sdkmanager "ndk;18.1.5063045"
 			"""
 		}
 
 		// Now we can build the Dependencies for Krita's build
 		stage('Building Dependencies') {
 			// This is relatively straight forward
 			// For this we do need to unset QT_ANDROID though, to ensure it builds it's own patched version rather than using the normal one we rely on elsewhere
 			// Then we invoke them!
 			sh """
 				unset QT_ANDROID
 				unset QMAKESPEC
 				
 				export ANDROID_ABI=arm64-v8a
 				export ANDROID_API_LEVEL=28
-				export CMAKE_ANDROID_NDK=$ANDROID_SDK_ROOT/ndk/21.0.6113669/
+				export CMAKE_ANDROID_NDK=$ANDROID_SDK_ROOT/ndk/18.1.5063045/
 
 				krita/packaging/android/androidbuild.sh --src=$WORKSPACE/krita/ --build-type=Release --build-root=$WORKSPACE/build/ -p=boost
 				krita/packaging/android/androidbuild.sh --src=$WORKSPACE/krita/ --build-type=Release --build-root=$WORKSPACE/build/ -p=qt
 				krita/packaging/android/androidbuild.sh --src=$WORKSPACE/krita/ --build-type=Release --build-root=$WORKSPACE/build/ -p=3rdparty
 				krita/packaging/android/androidbuild.sh --src=$WORKSPACE/krita/ --build-type=Release --build-root=$WORKSPACE/build/ -p=kf5
 			"""
 		}
 
 		// Now we capture them for use
 		stage('Capturing Dependencies') {
 			// First we tar all of the dependencies up...
 			sh """
 				tar -cf $WORKSPACE/krita-android-deps.tar build/i/ build/kf5/kde/install/
 			"""
 
 			// Then we ask Jenkins to capture the tar file as an artifact
 			archiveArtifacts artifacts: 'krita-android-deps.tar', onlyIfSuccessful: true
 		}
 	}
 }
 }