diff --git a/.github/workflows/build-uaa-test.yml b/.github/workflows/build-uaa-test.yml
index f85742a6eb..04753a42d7 100644
--- a/.github/workflows/build-uaa-test.yml
+++ b/.github/workflows/build-uaa-test.yml
@@ -38,4 +38,4 @@ jobs:
         with:
           context: ./src/docker/uaa
           push: true
-          tags: spring-cloud/scdf-uaa-test:4.32
+          tags: springcloud/scdf-uaa-test:4.32
diff --git a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/db/AbstractDataflowTests.java b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/db/AbstractDataflowTests.java
index de2ec97871..e7cb83a46f 100644
--- a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/db/AbstractDataflowTests.java
+++ b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/db/AbstractDataflowTests.java
@@ -90,7 +90,7 @@ protected static class EmptyConfig {
 	);
 
 	public final static List<ClusterContainer> OAUTH_CONTAINERS = Collections.singletonList(
-		ClusterContainer.from(TagNames.UAA_4_32, "spring-cloud/scdf-uaa-test:4.32", TagNames.UAA)
+		ClusterContainer.from(TagNames.UAA_4_32, "springcloud/scdf-uaa-test:4.32", TagNames.UAA)
 	);
 
 	@Autowired
diff --git a/src/docker/uaa/build-docker b/src/docker/uaa/build-docker
index c8a77b16cc..3e4cd39a5f 100755
--- a/src/docker/uaa/build-docker
+++ b/src/docker/uaa/build-docker
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build -t spring-cloud/scdf-uaa-test:4.32 .
+docker build -t springcloud/scdf-uaa-test:4.32 .