diff --git a/scripts/database/pg/migrations/018.do.table-indexes.sql b/scripts/database/pg/migrations/018.do.table-indexes.sql
new file mode 100644
index 00000000..375746e7
--- /dev/null
+++ b/scripts/database/pg/migrations/018.do.table-indexes.sql
@@ -0,0 +1,20 @@
+DO $$
+  BEGIN
+    BEGIN
+       CREATE INDEX dojos_country ON cd_dojos((country->>'name'));
+    EXCEPTION WHEN OTHERS THEN
+        RAISE NOTICE 'table cd_dojos have problem with index creation on column country.';
+    END;
+    BEGIN
+	   CREATE INDEX dojos_city ON cd_dojos((city->>'name'));
+    EXCEPTION WHEN OTHERS THEN
+        RAISE NOTICE 'table cd_dojos have problem with index creation on column city.';
+    END;
+    BEGIN
+	  CREATE INDEX dojos_name ON cd_dojos(name);
+    EXCEPTION WHEN OTHERS THEN
+        RAISE NOTICE 'table cd_dojos have problem with index creation on column name.';
+    END;
+  END;
+$$
+