diff --git a/.gitmodules b/.gitmodules
index 4ca61af64b..fccce22d8d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/uaa"]
 	path = src/uaa
-	url = https://github.com/cloudfoundry/uaa.git
+	url = https://github.com/alphagov/paas-uaa.git
diff --git a/packages/uaa/pre_packaging b/packages/uaa/pre_packaging
index cb12e83ac3..464bb421df 100644
--- a/packages/uaa/pre_packaging
+++ b/packages/uaa/pre_packaging
@@ -25,6 +25,7 @@ export PATH=$JAVA_HOME/bin:$PATH
 
 #build cloud foundry UAA war
 cd ${BUILD_DIR}/uaa
+export UAA_VERSION=v74.31.0
 GIT_DIR=$(find $RELEASE_DIR -path "*/modules/src/uaa") ./gradlew :clean :assemble --max-workers=4 -Pversion=${UAA_VERSION}
 cp uaa/build/libs/cloudfoundry-identity-uaa-${UAA_VERSION}.war ${BUILD_DIR}/uaa/cloudfoundry-identity-uaa.war
 cp statsd/build/libs/cloudfoundry-identity-statsd-${UAA_VERSION}.war ${BUILD_DIR}/uaa/cloudfoundry-identity-statsd.war
@@ -55,4 +56,3 @@ rm -f ${BUILD_DIR}/uaa/README.md
 rm -f ${BUILD_DIR}/uaa/settings.gradle
 rm -f ${BUILD_DIR}/uaa/shared_versions.gradle
 rm -rf ${BUILD_DIR}/uaa/uaa
-
diff --git a/src/uaa b/src/uaa
index 1185365cd3..e25afa777e 160000
--- a/src/uaa
+++ b/src/uaa
@@ -1 +1 @@
-Subproject commit 1185365cd338a9ae39cfca927887f734e5fca7fd
+Subproject commit e25afa777e621359a46142e6f12607314fefbc8c