diff --git a/.env b/.env
index 1cb202c2..18f9c7b0 100644
--- a/.env
+++ b/.env
@@ -48,3 +48,10 @@ MAX_PARALLEL_PSQL=5
 
 # Number of parallel threads to use when generating vector map tiles
 COPY_CONCURRENCY=10
+
+# Variables for generate tiles using PGquery
+PGHOSTS_LIST=
+# Uncomment when used PGquery
+#EXPORT_DIR=/import
+NO_GZIP=1
+USE_KEY_COLUMN=1
diff --git a/Makefile b/Makefile
index 9b2925da..96eb583c 100644
--- a/Makefile
+++ b/Makefile
@@ -407,6 +407,16 @@ generate-tiles: all start-db
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools \
 			mbtiles-tools meta-generate "$(MBTILES_LOCAL_FILE)" $(TILESET_FILE) --auto-minmax --show-ranges
 
+.PHONY: generate-tiles-pg
+generate-tiles-pg: all start-db
+	@$(assert_area_is_given)
+	@echo "Generating tiles into $(MBTILES_LOCAL_FILE) (will delete if already exists)..."
+	@rm -rf "$(MBTILES_LOCAL_FILE)"
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-tiles
+	@echo "Updating generated tile metadata ..."
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools \
+			mbtiles-tools meta-generate "$(MBTILES_LOCAL_FILE)" $(TILESET_FILE) --auto-minmax --show-ranges
+
 .PHONY: start-tileserver
 start-tileserver: init-dirs
 	@echo " "