diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fda279f0a75ed7d918d07358b5ebeee63667de2..8bc7b9c8412efb23ed68490d5a47c56198d4549e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 Upcoming version:
 -----------------
+  - re-added some parts for neo4j-spatial and geoserver (Nikolaus Krismer)
   - fixed parameter order issue (Nikolaus Krismer)
   - renamed datasets (Nikolaus Krismer)
   - added jenkins deploy mode (to prevent tomcat webapp deploy on dbis-tests) (Nikolaus Krismer)
diff --git a/bootstrap/config.sh b/bootstrap/config.sh
index 670aa15ca332ffe9518ad0b69413c1b03bff5936..06f2e3757a97b4e2fed93080e7c564e2c5a8f0ce 100755
--- a/bootstrap/config.sh
+++ b/bootstrap/config.sh
@@ -3,6 +3,7 @@
 # This is used to configure the behavior of the various bootstrap scripts.
 #############################
 
+IMPORT_DATA_GEOSERVER=false
 IMPORT_DATA_NEO4J_SPATIAL=true
 IMPORT_DATA_POSTGIS=true
 IMPORT_DATA_SPATIALITE=true
diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh
index 78914296847268a9305663553739f6a8d2ccb8d5..88c56d1560b9a6bc65ab13394f49b5a1a7553070 100755
--- a/bootstrap/importData.sh
+++ b/bootstrap/importData.sh
@@ -39,8 +39,15 @@ fn_arg2boolean DEPLOY_ALL_DATASETS "${3}" "${DEPLOY_ALL_DATASETS}"
 # Configuration (tool versions, ...) #
 ######################################
 
+CITY_POLYGON_DIR="${SHARED_CONF_DIR}/cityPolygons"
 #DENSITY="60,120,180,240,300"
 DENSITY="100,200,300,400,500,600,700,800,900,1000"
+OSM_DOWNLOAD_MIRROR="http://download.geofabrik.de"
+OSM_FILE_AUSTRIA="europe/austria-latest.osm.pbf"
+OSM_FILE_ITALY="europe/italy-latest.osm.pbf"
+OSM_FILE_US_CALIFORNIA="north-america/us/california-latest.osm.pbf"
+OSM_FILE_US_DC="north-america/us/district-of-columbia-latest.osm.pbf"
+OSM_KEYS="aerialway,highway,public_transport,railway,route"
 
 ############################
 # Function definitions     #
@@ -125,11 +132,26 @@ function fn_import_dataset_postgis() {
 }
 
 function fn_init_geoserver() {
+	# TODO: Do we really want to import data from OSM, so that it is available in geoserver (we publish data from within isochron-web to geoserver, but why should we do that with the raw data -> pgRouing comparison or similar?)
+	# TODO: Needs testing
 	if $AVAILABLE_NEO4J_SPATIAL; then
 		echo "Configuring neo4j data permissions for geoserver"
 		chown -R $TOMCAT_USER:$TOMCAT_USER $DEPLOY_DIR/neo4j/data/graph.db
 	fi
 
+	echo "Preparing data from OpenStreetMap to be imported into geoserver"
+	fn_filter_osm_data "Bolzano" "${OSM_FILE_ITALY}"
+	fn_filter_osm_data "Innsbruck" "${OSM_FILE_AUSTRIA}"
+	fn_filter_osm_data "Salzburg" "${OSM_FILE_AUSTRIA}"
+	fn_filter_osm_data "SanFrancisco" "${OSM_FILE_US_CALIFORNIA}"
+	fn_filter_osm_data "WashingtonDC" "${OSM_FILE_US_DC}"
+	if $DEPLOY_ALL_DATASETS; then
+		fn_filter_osm_data "Italy" "${OSM_FILE_ITALY}"
+		fn_filter_osm_data "AltoAdige" "${OSM_FILE_ITALY}"
+	fi
+
+	# TODO: We need to import the data into the database before issuing to geoserver that there are tables available
+
 	echo "Configuring geoserver $GEOSERVER_VERSION using geoserver-shell $GEOSERVER_SHELL_VERSION"
 	sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_ws.gs >> setup_geoserver_workspace.log 2>&1
 	sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_styles.gs >> setup_geoserver_styles.log 2>&1
@@ -140,11 +162,12 @@ function fn_init_geoserver() {
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_bolzano.gs >> setup_geoserver_neo4j.log 2>&1
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_innsbruck.gs >> setup_geoserver_neo4j.log 2>&1
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_sanfrancisco.gs >> setup_geoserver_neo4j.log 2>&1
+		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_washingtondc.gs >> setup_geoserver_neo4j.log 2>&1
 		if $DEPLOY_ALL_DATASETS; then
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_italy.gs >> setup_geoserver_neo4j.log 2>&1
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_altoadige.gs >> setup_geoserver_neo4j.log 2>&1
-			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft.gs >> setup_geoserver_neo4j.log 2>&1
 		fi
+		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft.gs >> setup_geoserver_neo4j.log 2>&1
 	fi
 	if $AVAILABLE_POSTGIS; then
 		# copy geoserver_setup_postgis_ds and replace username/password
@@ -156,11 +179,12 @@ function fn_init_geoserver() {
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_bolzano.gs >> setup_geoserver_postgis.log 2>&1
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_innsbruck.gs >> setup_geoserver_postgis.log 2>&1
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_sanfrancisco.gs >> setup_geoserver_postgis.log 2>&1
+		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_washingtondc.gs >> setup_geoserver_postgis.log 2>&1
 		if $DEPLOY_ALL_DATASETS; then
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_italy.gs >> setup_geoserver_postgis.log 2>&1
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_altoadige.gs >> setup_geoserver_postgis.log 2>&1
-			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft.gs >> setup_geoserver_postgis.log 2>&1
 		fi
+		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft.gs >> setup_geoserver_postgis.log 2>&1
 	fi
 }
 
@@ -193,6 +217,39 @@ function fn_import_spatialite() {
 	fi
 }
 
+function fn_filter_osm_data() {
+	local NAME="$1"
+	local OSM_FILE="$2"
+	local CITY=${NAME// /}
+	CITY=${CITY,,}
+	local OSM_FILE_FILTERED="${city}_filtered.osm"
+
+	if $UPDATE_DATA && [ -f "$DATA_DIR/$OSM_FILE_FILTERED" ]; then
+		echo "  - deleting outdated osm export (forced data update)"
+		rm -rf "$DATA_DIR/$OSM_FILE_FILTERED"
+	fi
+
+	if [ ! -f "$DATA_DIR/$OSM_FILE_FILTERED" ]; then
+		echo "  - downloading cached OpenStreetMap file"
+		fn_download_newer $DOWNLOAD_DIR/$OSM_FILE_FILTERED $CACHE_DIR_REMOTE_DATA/$OSM_FILE_FILTERED
+		cp $DOWNLOAD_DIR/$OSM_FILE_FILTERED $DATA_DIR/$OSM_FILE_FILTERED >> /dev/null 2>&1
+	fi
+
+	if [ ! -f $DATA_DIR/$OSM_FILE_FILTERED ]; then
+		echo "  - downloading OpenStreetMap file (no cached file found)"
+		OSM_FILENAME=$DOWNLOAD_DIR/${OSM_FILE##*/}
+		BOUNDING="${CITY_POLYGON_DIR}/${city}.poly"
+
+		fn_download_newer $OSM_FILENAME $OSM_DOWNLOAD_MIRROR/$OSM_FILE
+
+		if [[ "$BOUNDING" == *.poly ]]; then
+			echo "  - filtering OpenStreetMap file"
+			$DEPLOY_DIR/osmosis/bin/osmosis --read-pbf file="$OSM_FILENAME" --bounding-polygon file="$BOUNDING_POLYGON" --way-key keyList="$OSM_KEYS" --used-node --write-xml file="$DATA_DIR/$OSM_FILE_FILTERED" >> "filter_osmData_$NAME.log" 2>&1
+		fi
+	fi
+}
+
+
 ################
 # Data import  #
 ################
@@ -223,11 +280,12 @@ for CURRENT_SRID in "${SRID_ARR[@]}"; do
 	fn_import_dataset "Innsbruck" "$CURRENT_SRID"
 	fn_import_dataset "Salzburg" "$CURRENT_SRID"
 	fn_import_dataset "SanFrancisco" "$CURRENT_SRID"
+	fn_import_dataset "WashingtonDC" "$CURRENT_SRID"
 	if $DEPLOY_ALL_DATASETS; then
 		fn_import_dataset "Italy" "$CURRENT_SRID"
 		fn_import_dataset "AltoAdige" "$CURRENT_SRID"
 	fi
-	
+
 	# Not importing datasets one-by-one into spatialite -> we copy data from postgis (after postgis data import)
 	if $IMPORT_DATA_SPATIALITE; then
 		fn_import_spatialite "$CURRENT_SRID"
diff --git a/conf/geoserver_setup_neo4j_ft.gs b/conf/geoserver_setup_neo4j_ft.gs
index 2c46442a4d9a7a355b2cda278bb270843bafde11..429b25a420f7f17d79904150a9b8773b688b1eed 100644
--- a/conf/geoserver_setup_neo4j_ft.gs
+++ b/conf/geoserver_setup_neo4j_ft.gs
@@ -1,3 +1,3 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
-#layer group create --workspace isochrone --layers n4j_bz_ways,n4j_ibk_ways --name n4j_ways --styles line,line
+#layer group create --workspace isochrone --layers n4j_bolzano_ways,n4j_innsbruck_ways --name n4j_ways --styles line,line
diff --git a/conf/geoserver_setup_neo4j_ft_altoadige.gs b/conf/geoserver_setup_neo4j_ft_altoadige.gs
index 9c300ec15d74ed6add463e84f9ff4aef5472a975..c3416965c520d4714645d3e84afe58eb7702db8d 100644
--- a/conf/geoserver_setup_neo4j_ft_altoadige.gs
+++ b/conf/geoserver_setup_neo4j_ft_altoadige.gs
@@ -1,5 +1,5 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
-# ToDo: Create featuretype for datastore "Neo4j" and public roads in southern tyrol
-# featuretype publish --workspace isochrone --datastore Neo4J --featuretype /opt/southtyrol-131201-filtered.osm
-# featuretype create --workspace isochrone --datastore Neo4J --featuretype /opt/southtyrol-131201-filtered.osm --enabled true --advertised true --title neo4j_st_ways --srs EPSG:4326 --schema "the_geom:LineString:srid=4326" --projectionpolicy FORCE_DECLARED
\ No newline at end of file
+# ToDo: Create featuretype for datastore "Neo4j" and public roads in southern tyrol (alto adige)
+# featuretype publish --workspace isochrone --datastore Neo4J --featuretype /opt/altoadige-filtered.osm
+# featuretype create --workspace isochrone --datastore Neo4J --featuretype /opt/altoadige-filtered.osm --enabled true --advertised true --title n4j_altoadige_ways --srs EPSG:4326 --schema "the_geom:LineString:srid=4326" --projectionpolicy FORCE_DECLARED
diff --git a/conf/geoserver_setup_neo4j_ft_bolzano.gs b/conf/geoserver_setup_neo4j_ft_bolzano.gs
index f785e08b7013dc6eb8d3c5e21b779b56ba28e678..205baa8348928595dc09cae3b8ab4031fbb7fb37 100644
--- a/conf/geoserver_setup_neo4j_ft_bolzano.gs
+++ b/conf/geoserver_setup_neo4j_ft_bolzano.gs
@@ -1,5 +1,5 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
 # ToDo: Create featuretype for datastore "Neo4j" and public roads in bozen
-# featuretype publish --workspace isochrone --datastore Neo4J --featuretype /opt/bozen-131201-filtered.osm
-# featuretype create --workspace isochrone --datastore Neo4J --featuretype /opt/bozen-131201-filtered.osm --enabled true --advertised true --title neo4j_bz_ways --srs EPSG:4326 --schema "the_geom:LineString:srid=4326" --projectionpolicy FORCE_DECLARED
\ No newline at end of file
+# featuretype publish --workspace isochrone --datastore Neo4J --featuretype /opt/bolzano-filtered.osm
+# featuretype create --workspace isochrone --datastore Neo4J --featuretype /opt/bolzano-filtered.osm --enabled true --advertised true --title n4j_bolzano_ways --srs EPSG:4326 --schema "the_geom:LineString:srid=4326" --projectionpolicy FORCE_DECLARED
diff --git a/conf/geoserver_setup_neo4j_ft_innsbruck.gs b/conf/geoserver_setup_neo4j_ft_innsbruck.gs
index 64d7cbdd23f5564e69eef80fc13f6ed77dc99aa3..14c31d6b1dd80009df74ac03c6ebd3cde0706f52 100644
--- a/conf/geoserver_setup_neo4j_ft_innsbruck.gs
+++ b/conf/geoserver_setup_neo4j_ft_innsbruck.gs
@@ -1,5 +1,5 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
-# ToDo: Create featuretype for datastore "Neo4j" and public roads in innsbruck
-# featuretype publish --workspace isochrone --datastore Neo4J --featuretype /opt/innsbruck-131201-filtered.osm
-# featuretype create --workspace isochrone --datastore Neo4J --featuretype /opt/innsbruck-131201-filtered.osm --enabled true --advertised true --title neo4j_ibk_ways --srs EPSG:4326 --schema "the_geom:LineString:srid=4326" --projectionpolicy FORCE_DECLARED
+# ToDo: Create featuretype for datastore "Neo4j" and public roads in Innsbruck
+# featuretype publish --workspace isochrone --datastore Neo4J --featuretype /opt/innsbruck-filtered.osm
+# featuretype create --workspace isochrone --datastore Neo4J --featuretype /opt/innsbruck-filtered.osm --enabled true --advertised true --title neo4j_innsbruck_ways --srs EPSG:4326 --schema "the_geom:LineString:srid=4326" --projectionpolicy FORCE_DECLARED
diff --git a/conf/geoserver_setup_neo4j_ft_italy.gs b/conf/geoserver_setup_neo4j_ft_italy.gs
index 16c552151787a5e303089a148b5dd991248cd499..add722fe323a8cde7b38b0ffdedc3db6238bb51d 100644
--- a/conf/geoserver_setup_neo4j_ft_italy.gs
+++ b/conf/geoserver_setup_neo4j_ft_italy.gs
@@ -1,5 +1,5 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
-# ToDo: Create featuretype for datastore "Neo4j" and public roads in italy
-# featuretype publish --workspace isochrone --datastore Neo4J --featuretype /opt/italy-131201-filtered.osm
-# featuretype create --workspace isochrone --datastore Neo4J --featuretype /opt/italy-131201-filtered.osm --enabled true --advertised true --title neo4j_it_ways --srs EPSG:4326 --schema "the_geom:LineString:srid=4326" --projectionpolicy FORCE_DECLARED
\ No newline at end of file
+# ToDo: Create featuretype for datastore "Neo4j" and public roads in Italy
+# featuretype publish --workspace isochrone --datastore Neo4J --featuretype /opt/italy-filtered.osm
+# featuretype create --workspace isochrone --datastore Neo4J --featuretype /opt/italy-filtered.osm --enabled true --advertised true --title n4j_italy_ways --srs EPSG:4326 --schema "the_geom:LineString:srid=4326" --projectionpolicy FORCE_DECLARED
diff --git a/conf/geoserver_setup_neo4j_ft_sanfrancisco.gs b/conf/geoserver_setup_neo4j_ft_sanfrancisco.gs
index 4ba520d28be9e80b3f36926d24fc61b661bb9661..cbe492895fdf36192371088993597bc034855ced 100644
--- a/conf/geoserver_setup_neo4j_ft_sanfrancisco.gs
+++ b/conf/geoserver_setup_neo4j_ft_sanfrancisco.gs
@@ -1,5 +1,5 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
-# ToDo: Create featuretype for datastore "Neo4j" and public roads in italy
-# featuretype publish --workspace isochrone --datastore Neo4J --featuretype /opt/sanfrancisco-131201-filtered.osm
-# featuretype create --workspace isochrone --datastore Neo4J --featuretype /opt/sanfrancisco-131201-filtered.osm --enabled true --advertised true --title neo4j_sf_ways --srs EPSG:4326 --schema "the_geom:LineString:srid=4326" --projectionpolicy FORCE_DECLARED
\ No newline at end of file
+# ToDo: Create featuretype for datastore "Neo4j" and public roads in SanFrancisco
+# featuretype publish --workspace isochrone --datastore Neo4J --featuretype /opt/sanfrancisco-filtered.osm
+# featuretype create --workspace isochrone --datastore Neo4J --featuretype /opt/sanfrancisco-filtered.osm --enabled true --advertised true --title n4j_sanfrancisco_ways --srs EPSG:4326 --schema "the_geom:LineString:srid=4326" --projectionpolicy FORCE_DECLARED
diff --git a/conf/geoserver_setup_neo4j_ft_washingtondc.gs b/conf/geoserver_setup_neo4j_ft_washingtondc.gs
new file mode 100644
index 0000000000000000000000000000000000000000..6dac9353c51bea85d29d21a979b427714ab184b1
--- /dev/null
+++ b/conf/geoserver_setup_neo4j_ft_washingtondc.gs
@@ -0,0 +1,5 @@
+geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
+
+# ToDo: Create featuretype for datastore "Neo4j" and public roads in SanFrancisco
+# featuretype publish --workspace isochrone --datastore Neo4J --featuretype /opt/washingtondc-filtered.osm
+# featuretype create --workspace isochrone --datastore Neo4J --featuretype /opt/washingtondc-filtered.osm --enabled true --advertised true --title n4j_washingtondc_ways --srs EPSG:4326 --schema "the_geom:LineString:srid=4326" --projectionpolicy FORCE_DECLARED
diff --git a/conf/geoserver_setup_postgis_ft.gs b/conf/geoserver_setup_postgis_ft.gs
index ad364f0fcbc897a42642e6567a744c176ec78d4b..cb7c96ac45a787445eac7ac548758c32d14a292d 100644
--- a/conf/geoserver_setup_postgis_ft.gs
+++ b/conf/geoserver_setup_postgis_ft.gs
@@ -1,3 +1,3 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
-layer group create --workspace isochrone --layers pg_bz_ways,pg_ibk_ways --name pg_ways --styles line,line
+layer group create --workspace isochrone --layers pg_bolzano_ways,pg_innsbruck_ways --name pg_ways --styles line,line
diff --git a/conf/geoserver_setup_postgis_ft_altoadige.gs b/conf/geoserver_setup_postgis_ft_altoadige.gs
index 5e9d7e8ee9ac0eb2ac202440a589609ec617dba9..1d4fac566378f9a6b73c82baf34d2164ad5684e1 100644
--- a/conf/geoserver_setup_postgis_ft_altoadige.gs
+++ b/conf/geoserver_setup_postgis_ft_altoadige.gs
@@ -1,6 +1,6 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
-postgis featuretype publish --workspace isochrone --datastore PostGIS --table st_ways
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "st_ways" --name "pg_st_ways"
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "pg_st_ways" --title "Ways in SouthTyrol"
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "pg_st_ways" --enabled true
+postgis featuretype publish --workspace isochrone --datastore PostGIS --table osm_altoadige_ways
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "osm_altoadige_ways" --name "altoadige_ways"
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "altoadige_ways" --title "Ways in SouthTyrol"
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "altoadige_ways" --enabled true
diff --git a/conf/geoserver_setup_postgis_ft_bolzano.gs b/conf/geoserver_setup_postgis_ft_bolzano.gs
index c9408b7563b5516de1d0da773b1107fea5cdda38..b02b9633d1a5a060fc312951e49e694a757cfa06 100644
--- a/conf/geoserver_setup_postgis_ft_bolzano.gs
+++ b/conf/geoserver_setup_postgis_ft_bolzano.gs
@@ -1,6 +1,6 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
-postgis featuretype publish --workspace isochrone --datastore PostGIS --table bz_ways
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "bz_ways" --name "pg_bz_ways"
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "pg_bz_ways" --title "Ways in Bozen"
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "pg_bz_ways" --enabled true
+postgis featuretype publish --workspace isochrone --datastore PostGIS --table osm_bolzano_ways
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "osm_bolzano_ways" --name "bolzano_ways"
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "bolzano_ways" --title "Ways in Bozen"
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "bolzano_ways" --enabled true
diff --git a/conf/geoserver_setup_postgis_ft_innsbruck.gs b/conf/geoserver_setup_postgis_ft_innsbruck.gs
index 9988d40a640e6da44aa216d07dd3674e1098be01..87aa1b50a079365830caadb9fcbe79053359748d 100644
--- a/conf/geoserver_setup_postgis_ft_innsbruck.gs
+++ b/conf/geoserver_setup_postgis_ft_innsbruck.gs
@@ -1,6 +1,6 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
-postgis featuretype publish --workspace isochrone --datastore PostGIS --table ibk_ways
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "ibk_ways" --name "pg_ibk_ways"
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "pg_ibk_ways" --title "Ways in Innsbruck"
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "pg_ibk_ways" --enabled true
+postgis featuretype publish --workspace isochrone --datastore PostGIS --table osm_innsbruck_ways
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "osm_innsbruck_ways" --name "innsbruck_ways"
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "innsbruck_ways" --title "Ways in Innsbruck"
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "innsbruck_ways" --enabled true
diff --git a/conf/geoserver_setup_postgis_ft_italy.gs b/conf/geoserver_setup_postgis_ft_italy.gs
index 751c58ab3389158b7547526ada641e82b5b977ad..42212df52f2312cd9adc58d729835a19f4533fa5 100644
--- a/conf/geoserver_setup_postgis_ft_italy.gs
+++ b/conf/geoserver_setup_postgis_ft_italy.gs
@@ -1,6 +1,6 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
-postgis featuretype publish --workspace isochrone --datastore PostGIS --table it_ways
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "it_ways" --name "pg_it_ways"
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "pg_it_ways" --title "Ways in Italy"
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "pg_it_ways" --enabled true
+postgis featuretype publish --workspace isochrone --datastore PostGIS --table osm_italy_ways
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "osm_italy_ways" --name "italy_ways"
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "italy_ways" --title "Ways in Italy"
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "italy_ways" --enabled true
diff --git a/conf/geoserver_setup_postgis_ft_sanfrancisco.gs b/conf/geoserver_setup_postgis_ft_sanfrancisco.gs
index 9ec673952184384ee11c3816823190408c353324..2b06f8229085594bc718a1b73722c80207b59cfa 100644
--- a/conf/geoserver_setup_postgis_ft_sanfrancisco.gs
+++ b/conf/geoserver_setup_postgis_ft_sanfrancisco.gs
@@ -1,6 +1,6 @@
 geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
 
-postgis featuretype publish --workspace isochrone --datastore PostGIS --table sf_ways
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "sf_ways" --name "pg_sf_ways"
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "pg_sf_ways" --title "Ways in SanFrancisco"
-featuretype modify --workspace isochrone --datastore PostGIS --featuretype "pg_sf_ways" --enabled true
+postgis featuretype publish --workspace isochrone --datastore PostGIS --table osm_sanfrancisco_ways
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "osm_sanfrancisco_ways" --name "sanfrancisco_ways"
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "sanfrancisco_ways" --title "Ways in SanFrancisco"
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "sanfrancisco_ways" --enabled true
diff --git a/conf/geoserver_setup_postgis_ft_washingtondc.gs b/conf/geoserver_setup_postgis_ft_washingtondc.gs
new file mode 100644
index 0000000000000000000000000000000000000000..eb57c2a7e2f50f9d661d5f6cde83453dfa0b301e
--- /dev/null
+++ b/conf/geoserver_setup_postgis_ft_washingtondc.gs
@@ -0,0 +1,6 @@
+geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
+
+postgis featuretype publish --workspace isochrone --datastore PostGIS --table osm_washingtondc_ways
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "osm_washingtondc_ways" --name "washingtondc_ways"
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "washingtondc_ways" --title "Ways in Washington,D.C."
+featuretype modify --workspace isochrone --datastore PostGIS --featuretype "washingtondc_ways" --enabled true