diff --git a/README.md b/README.md
index cf5b5cab4..733b98147 100644
--- a/README.md
+++ b/README.md
@@ -236,11 +236,11 @@ To run tests that exercise the use of credentials to access a private docker reg
 * `private_docker_registry_username`
 * `private_docker_registry_password`
 
-These tests assume that the specified private docker image is a private version of the cloudfoundry/diego-docker-app-custom:latest. To upload a private version to your DockerHub account, first create a private repository on DockerHub and log in to docker on the command line. Then run the following commands:
+These tests assume that the specified private docker image is a private version of the cloudfoundry/diego-docker-app:latest. To upload a private version to your DockerHub account, first create a private repository on DockerHub and log in to docker on the command line. Then run the following commands:
 
 ```bash
-docker pull cloudfoundry/diego-docker-app-custom:latest
-docker tag cloudfoundry/diego-docker-app-custom:latest <your-private-repo>:<some-tag>
+docker pull cloudfoundry/diego-docker-app:latest
+docker tag cloudfoundry/diego-docker-app:latest <your-private-repo>:<some-tag>
 docker push <your-private-repo>:<some-tag>
 ```
 
diff --git a/docker/credhub_enabled.go b/docker/credhub_enabled.go
index 9ace3eee8..74e40e37d 100644
--- a/docker/credhub_enabled.go
+++ b/docker/credhub_enabled.go
@@ -96,7 +96,7 @@ var _ = DockerDescribe("Docker App Lifecycle CredHub Integration", func() {
 					"-m", DEFAULT_MEMORY_LIMIT,
 					"-d", Config.GetAppsDomain(),
 					"-i", "1",
-					"-c", fmt.Sprintf("/myapp/dockerapp -name=%s", appName)),
+					"-c", fmt.Sprintf("/myapp/bin/dockerapp -name=%s", appName)),
 				).Should(Exit(0))
 
 				workflowhelpers.AsUser(TestSetup.AdminUserContext(), Config.DefaultTimeoutDuration(), func() {
diff --git a/docker/docker_lifecycle.go b/docker/docker_lifecycle.go
index a72930c56..11b1d56bb 100644
--- a/docker/docker_lifecycle.go
+++ b/docker/docker_lifecycle.go
@@ -49,7 +49,7 @@ var _ = DockerDescribe("Docker Application Lifecycle", func() {
 				"-m", DEFAULT_MEMORY_LIMIT,
 				"-d", Config.GetAppsDomain(),
 				"-i", "1",
-				"-c", fmt.Sprintf("/myapp/dockerapp -name=%s", appName)),
+				"-c", fmt.Sprintf("/myapp/bin/dockerapp -name=%s", appName)),
 			).Should(Exit(0))
 		})
 
@@ -98,7 +98,7 @@ var _ = DockerDescribe("Docker Application Lifecycle", func() {
 			Expect(env_vars).NotTo(HaveKey("TMPDIR"))
 
 			// docker image values should remain
-			Expect(env_vars).To(HaveKeyWithValue("HOME", "/home/dockeruser"))
+			Expect(env_vars).To(HaveKeyWithValue("HOME", "/home/some_docker_user"))
 			Expect(env_vars).To(HaveKeyWithValue("SOME_VAR", "some_docker_value"))
 			Expect(env_vars).To(HaveKeyWithValue("BAD_QUOTE", "'"))
 			Expect(env_vars).To(HaveKeyWithValue("BAD_SHELL", "$1"))
diff --git a/helpers/config/config_struct.go b/helpers/config/config_struct.go
index 7105733f7..f4c6c4ada 100644
--- a/helpers/config/config_struct.go
+++ b/helpers/config/config_struct.go
@@ -225,7 +225,7 @@ func getDefaults() config {
 	defaults.PrivateDockerRegistryImage = ptrToString("")
 	defaults.PrivateDockerRegistryUsername = ptrToString("")
 	defaults.PrivateDockerRegistryPassword = ptrToString("")
-	defaults.PublicDockerAppImage = ptrToString("cloudfoundry/diego-docker-app-custom:latest")
+	defaults.PublicDockerAppImage = ptrToString("cloudfoundry/diego-docker-app:latest")
 
 	defaults.UnallocatedIPForSecurityGroup = ptrToString("10.0.244.255")
 	defaults.RequireProxiedAppTraffic = ptrToBool(false)
diff --git a/helpers/config/config_test.go b/helpers/config/config_test.go
index 4f8d38035..eda483005 100644
--- a/helpers/config/config_test.go
+++ b/helpers/config/config_test.go
@@ -306,7 +306,7 @@ var _ = Describe("Config", func() {
 		Expect(config.DetectTimeoutDuration()).To(Equal(10 * time.Minute))
 		Expect(config.SleepTimeoutDuration()).To(Equal(60 * time.Second))
 
-		Expect(config.GetPublicDockerAppImage()).To(Equal("cloudfoundry/diego-docker-app-custom:latest"))
+		Expect(config.GetPublicDockerAppImage()).To(Equal("cloudfoundry/diego-docker-app:latest"))
 		Expect(config.GetUnallocatedIPForSecurityGroup()).To(Equal("10.0.244.255"))
 
 		Expect(config.GetCredHubBrokerClientCredential()).To(Equal("credhub_admin_client"))