diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43684d04..71dcca59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Features:
   - Update bundler to 2.0 [#250](https://github.com/platanus/potassium/pull/250)
   - Update Rails to 6.0.2 [#251](https://github.com/platanus/potassium/pull/251)
   - Improve specs performance [#259](https://github.com/platanus/potassium/pull/259)
+  - Dasherize app name in docker compose related files [#261](https://github.com/platanus/potassium/pull/261)
 
 Fix:
   - Correctly use cache for bundle dependencies in CircleCI build [#244](https://github.com/platanus/potassium/pull/244) and [#258](https://github.com/platanus/potassium/pull/258)
diff --git a/lib/potassium/assets/Makefile.erb b/lib/potassium/assets/Makefile.erb
index 270dffc6..13d2740f 100644
--- a/lib/potassium/assets/Makefile.erb
+++ b/lib/potassium/assets/Makefile.erb
@@ -1,4 +1,4 @@
-PROJECT ?= <%= get(:underscorized_app_name) %>
+PROJECT ?= <%= get(:dasherized_app_name) %>
 DOCKER_COMPOSE_FILE ?= docker-compose.yml
 
 DOCKER_COMPOSE_ARGS ?= -p $(PROJECT) -f $(DOCKER_COMPOSE_FILE)
diff --git a/lib/potassium/assets/config/database_mysql.yml.erb b/lib/potassium/assets/config/database_mysql.yml.erb
index 27cdcdda..0fa4456a 100644
--- a/lib/potassium/assets/config/database_mysql.yml.erb
+++ b/lib/potassium/assets/config/database_mysql.yml.erb
@@ -1,6 +1,6 @@
 development: &default
   adapter: mysql2
-  database: <%= get(:underscorized_app_name) %>_development
+  database: <%= get(:dasherized_app_name) %>_development
   encoding: utf8
   host: <%%= ENV["DB_HOST"] || "127.0.0.1" %>
   port: <%%= ENV["DB_PORT"] || 3306 %>
@@ -12,7 +12,7 @@ development: &default
 
 test:
   <<: *default
-  database: <%= get(:underscorized_app_name) %>_test
+  database: <%= get(:dasherized_app_name) %>_test
 
 production: &deploy
   encoding: utf8
diff --git a/lib/potassium/assets/config/database_postgresql.yml.erb b/lib/potassium/assets/config/database_postgresql.yml.erb
index 6cef692d..c3ed4f69 100644
--- a/lib/potassium/assets/config/database_postgresql.yml.erb
+++ b/lib/potassium/assets/config/database_postgresql.yml.erb
@@ -1,6 +1,6 @@
 development: &default
   adapter: postgresql
-  database: <%= get(:underscorized_app_name) %>_development
+  database: <%= get(:dasherized_app_name) %>_development
   encoding: utf8
   host: <%%= ENV["DB_HOST"] || "127.0.0.1" %>
   port: <%%= ENV["DB_PORT"] || 5432 %>
@@ -12,7 +12,7 @@ development: &default
 
 test:
   <<: *default
-  database: <%= get(:underscorized_app_name) %>_test
+  database: <%= get(:dasherized_app_name) %>_test
 
 production: &deploy
   encoding: utf8