diff --git a/.template/spec/support/serverspec.rb b/.template/spec/support/serverspec.rb
index 8efdb70b..b415595f 100644
--- a/.template/spec/support/serverspec.rb
+++ b/.template/spec/support/serverspec.rb
@@ -15,7 +15,7 @@ def self.test_container
       logger.warn "Container: #{container.id} #{container.info['Names']}"
     end
 
-    container_name = "#{ENV.fetch('APP_NAME')}-test-run"
+    container_name = "#{ENV.fetch('APP_NAME')}-test"
     container_id = `docker ps -qf "name=#{container_name}"`
     logger.warn "Container name: #{container_name}"
     logger.warn "Container ID: #{container_id}"
diff --git a/template.rb b/template.rb
index 6a7b592b..e80b9ef1 100644
--- a/template.rb
+++ b/template.rb
@@ -3,7 +3,7 @@
 require 'shellwords'
 
 # Variables
-APP_NAME = app_name
+APP_NAME = app_name.tr('_', '-')
 # Transform the app name from slug to human-readable name e.g. nimble-web -> Nimble
 APP_NAME_HUMANIZED = app_name.split(/[-_]/).map(&:capitalize).join(' ').gsub(/ Web$/, '')
 DOCKER_REGISTRY_HOST = 'docker.io'