diff --git a/core/roboconf-target-docker/src/main/java/net/roboconf/target/docker/internal/DockerMachineConfigurator.java b/core/roboconf-target-docker/src/main/java/net/roboconf/target/docker/internal/DockerMachineConfigurator.java
index <HASH>..<HASH> 100644
--- a/core/roboconf-target-docker/src/main/java/net/roboconf/target/docker/internal/DockerMachineConfigurator.java
+++ b/core/roboconf-target-docker/src/main/java/net/roboconf/target/docker/internal/DockerMachineConfigurator.java
@@ -152,7 +152,13 @@ public class DockerMachineConfigurator implements MachineConfigurator {
 
 		// Execute...
 		try {
-			String containerName = this.scopedInstancePath.replaceFirst( "^/", "" ).replace( "/", "-" ).replaceAll( "\\s+", "_" );
+			String containerName = this.scopedInstancePath + "_from_" + this.applicationName;
+			containerName = containerName.replaceFirst( "^/", "" ).replace( "/", "-" ).replaceAll( "\\s+", "_" );
+
+			// Prevent container names from being too long (see #480)
+			if( containerName.length() > 61 )
+				containerName = containerName.substring( 0, 61 );
+
 			CreateContainerCmd cmd = this.dockerClient.createContainerCmd( imageId )
 					.withName( containerName )
 					.withCmd( args.toArray( new String[ args.size()]));
#<I> Docker container names should include the application name