diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index b3c4b4949abe..584f8124bf06 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -48,6 +48,8 @@ import org.gradle.api.tasks.PathSensitivity
 import org.gradle.testing.jacoco.tasks.JacocoReport
 
 import java.net.ServerSocket
+
+import static java.util.UUID.randomUUID
 /**
  * This plugin adds methods to configure a module with Beam's defaults, called "natures".
  *
@@ -2787,9 +2789,10 @@ class BeamModulePlugin implements Plugin<Project> {
       def pythonDir = project.project(":sdks:python").projectDir
       def externalPort = getRandomPort()
       def launcherJar = project.project(':sdks:java:transform-service:launcher').shadowJar.archivePath
+      def groupId = project.name + randomUUID().toString()
       def transformServiceOpts = [
         "transform_service_launcher_jar": launcherJar,
-        "group_id": project.name,
+        "group_id": groupId,
         "external_port": externalPort,
         "beam_version": project.version
       ]
@@ -2807,9 +2810,17 @@ class BeamModulePlugin implements Plugin<Project> {
         throw new GradleException(exceptionMessage)
       }
 
+      // Transform service delivers transforms that refer to SDK harness containers with following sufixes.
+      def transformServiceJavaContainerSuffix = 'java11'
+      def transformServicePythonContainerSuffix = '38'
+
       def setupTask = project.tasks.register(config.name+"Setup", Exec) {
+        // Containers for main SDKs when running tests.
         dependsOn ':sdks:java:container:'+javaContainerSuffix+':docker'
         dependsOn ':sdks:python:container:py'+pythonContainerSuffix+':docker'
+        // Containers for external SDKs used through the transform service.
+        dependsOn ':sdks:java:container:'+transformServiceJavaContainerSuffix+':docker'
+        dependsOn ':sdks:python:container:py'+transformServicePythonContainerSuffix+':docker'
         dependsOn ':sdks:java:transform-service:controller-container:docker'
         dependsOn ':sdks:python:expansion-service-container:docker'
         dependsOn ':sdks:java:expansion-service:container:docker'
diff --git a/sdks/python/scripts/run_transform_service.sh b/sdks/python/scripts/run_transform_service.sh
index d3bf12158d7c..b71d67707e06 100755
--- a/sdks/python/scripts/run_transform_service.sh
+++ b/sdks/python/scripts/run_transform_service.sh
@@ -76,10 +76,15 @@ TEMP_DIR=/tmp
 case $STARTSTOP in
   start)
     echo "Starting the transform service for project $GROUP_ID at port $EXTERNAL_PORT for Beam version $BEAM_VERSION_DOCKER transform service startup jar is $TRANSFORM_SERVICE_LAUNCHER_JAR"
-    java -jar $TRANSFORM_SERVICE_LAUNCHER_JAR --project_name $GROUP_ID --port $EXTERNAL_PORT --beam_version $BEAM_VERSION_DOCKER --command up  >$TEMP_DIR/$FILE_BASE-java1.log 2>&1 </dev/null &
+    java -jar $TRANSFORM_SERVICE_LAUNCHER_JAR --project_name $GROUP_ID --port $EXTERNAL_PORT --beam_version $BEAM_VERSION_DOCKER --command up  >$TEMP_DIR/$FILE_BASE-java1.log 2>&1 </dev/null
     ;;
   stop)
     echo "Stopping the transform service for project $GROUP_ID at port $EXTERNAL_PORT for Beam version $BEAM_VERSION_DOCKER  transform service startup jar is $TRANSFORM_SERVICE_LAUNCHER_JAR"
-    java -jar $TRANSFORM_SERVICE_LAUNCHER_JAR --project_name $GROUP_ID --port $EXTERNAL_PORT --beam_version $BEAM_VERSION_DOCKER --command down  >$TEMP_DIR/$FILE_BASE-java2.log 2>&1 </dev/null &
+    java -jar $TRANSFORM_SERVICE_LAUNCHER_JAR --project_name $GROUP_ID --port $EXTERNAL_PORT --beam_version $BEAM_VERSION_DOCKER --command down  >$TEMP_DIR/$FILE_BASE-java2.log 2>&1 </dev/null
+    TRANSFORM_SERVICE_TEMP_DIR=$TEMP_DIR/$GROUP_ID
+    if [[ -d ${TRANSFORM_SERVICE_TEMP_DIR} ]]; then
+      echo "Removing transform service temporary directory $TRANSFORM_SERVICE_TEMP_DIR"
+      rm -rf ${TRANSFORM_SERVICE_TEMP_DIR}
+    fi
     ;;
 esac