diff --git a/database.yml b/database.yml
index 196359bfd..d8c1567e8 100644
--- a/database.yml
+++ b/database.yml
@@ -4,12 +4,12 @@ mysql:
   host: {{ envOr "MYSQL_HOST" "127.0.0.1"  }}
   port: {{ envOr "MYSQL_PORT" "3306"  }}
   user: {{ envOr "MYSQL_USER"  "root"  }}
-  password: {{ envOr "MYSQL_PASSWORD"  "root"  }}
+  password: {{ envOr "MYSQL_PASSWORD"  "root#"  }}
   options:
     readTimeout: 5s
 
 postgres:
-  url: {{ envOr "POSTGRESQL_URL" "postgres://postgres:postgres@localhost:5433/pop_test?sslmode=disable" }}
+  url: {{ envOr "POSTGRESQL_URL" "postgres://postgres:postgres%23@localhost:5433/pop_test?sslmode=disable" }}
   pool: 25
 
 cockroach:
diff --git a/docker-compose.yml b/docker-compose.yml
index 0a9725fdc..033c35af2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,10 +4,10 @@ services:
   mysql:
     image: mysql:5.7
     environment:
-      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_ROOT_PASSWORD=root#
       - MYSQL_DATABASE=pop_test
       - MYSQL_USER=pop
-      - MYSQL_PASSWORD=pop
+      - MYSQL_PASSWORD=pop#
     ports:
       - "3307:3306"
     healthcheck:
@@ -22,7 +22,7 @@ services:
     environment:
       - POSTGRES_DB=pop_test
       - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_PASSWORD=postgres#
       - POSTGRES_DB=postgres
     ports:
       - "5433:5432"