diff --git a/.gitmodules b/.gitmodules
index 39e2c76ea..45ec1707f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "libs/common-ui"]
 	path = libs/common-ui
-	url = https://git.iqser.com/scm/sl/common-ui.git
+	url = ssh://git@git.iqser.com:2222/sl/common-ui.git
diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
index b825c5b0b..c11bc0b61 100644
--- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java
+++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
@@ -67,6 +67,21 @@ public class PlanSpec {
                 .name("redaction-ui")
                 .url("ssh://git@git.iqser.com:2222/red/ui.git")
                 .branch("master")
+                .verboseLogs(true)
+                .remoteAgentCacheEnabled(false)
+                .fetchWholeRepository(true)
+                .shallowClonesEnabled(false)
+//                .submodulesEnabled(true)
+                .authentication(new SharedCredentialsIdentifier("bamboo-agent")
+                    .scope(SharedCredentialsScope.GLOBAL)))
+            .planRepositories(new GitRepository()
+                .name("common-ui")
+                .url("ssh://git@git.iqser.com:2222/sl/common-ui.git")
+                .branch("master")
+                .verboseLogs(true)
+                .remoteAgentCacheEnabled(false)
+                .fetchWholeRepository(true)
+                .shallowClonesEnabled(false)
                 .authentication(new SharedCredentialsIdentifier("bamboo-agent")
                     .scope(SharedCredentialsScope.GLOBAL)))
             .planBranchManagement(new PlanBranchManagement().createForVcsBranch().delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(30)).notificationForCommitters());
@@ -77,7 +92,10 @@ public class PlanSpec {
             .tasks(
                 new CleanWorkingDirectoryTask().description("My clean working directory task"),
                 // Checkout
-                new VcsCheckoutTask().description("Checkout Default Repository")
+                new VcsCheckoutTask().description("Checkout Common UI Repository")
+                    .checkoutItems(new CheckoutItem().repository("common-ui").path("common-ui")).cleanCheckout(true),
+
+                new VcsCheckoutTask().description("Checkout Redaction Repository")
                     .checkoutItems(new CheckoutItem().repository("redaction-ui").path("redaction-ui")),
 
                 // Build
diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh
index d34808bc2..0f791311e 100755
--- a/bamboo-specs/src/main/resources/scripts/build.sh
+++ b/bamboo-specs/src/main/resources/scripts/build.sh
@@ -5,6 +5,14 @@ set -e
 imageName="nexus.iqser.com:5001/red/$PROJECT"
 dockerfileLocation="docker/$PROJECT/Dockerfile"
 
+git submodule status
+commonUIVersion=$(git submodule status | awk '{ print $1 }' | sed 's|-||g')
+echo $commonUIVersion
+cd ../common-ui
+git checkout $commonUIVersion
+cd ../redaction-ui
+mv ../common-ui ./libs/
+
 echo "On branch $bamboo_planRepository_branchName building project $PROJECT"
 # shellcheck disable=SC2154
 if [[ "$bamboo_planRepository_branchName" == "master" ]]