diff --git a/data/ansible/roles/postgresql/defaults/main.yaml b/data/ansible/roles/postgresql/defaults/main.yaml
index c631e6a1a..6215654df 100644
--- a/data/ansible/roles/postgresql/defaults/main.yaml
+++ b/data/ansible/roles/postgresql/defaults/main.yaml
@@ -3,4 +3,4 @@ postgresql_version: "postgresql"
 postgresql_repo: "http://apt.postgresql.org/pub/repos/apt"
 postgresql_key_url: "https://www.postgresql.org/media/keys/ACCC4CF8.asc"
 postgresql_service_state: "started"
-postgresql_service_enabled: "no"
+postgresql_service_enabled: false
diff --git a/data/storage/postgres/create_tariffplan_tables.sql b/data/storage/postgres/create_tariffplan_tables.sql
index 4da89effc..0d0bca9b3 100644
--- a/data/storage/postgres/create_tariffplan_tables.sql
+++ b/data/storage/postgres/create_tariffplan_tables.sql
@@ -450,7 +450,7 @@ CREATE INDEX tp_routes_unique ON tp_routes  ("tpid",  "tenant", "id",
   "transport" varchar(64) NOT NULL,
   "connect_attempts" INTEGER NOT NULL,
   "reconnects" INTEGER NOT NULL,
-  `max_reconnect_interval` varchar(64) NOT NULL,
+  "max_reconnect_interval" varchar(64) NOT NULL,
   "connect_timeout" varchar(64) NOT NULL,
   "reply_timeout" varchar(64) NOT NULL,
   "tls" BOOLEAN NOT NULL,