diff --git a/compose/nominatim.yml b/compose/nominatim.yml
index cb0a1c07..ff3349d2 100644
--- a/compose/nominatim.yml
+++ b/compose/nominatim.yml
@@ -10,9 +10,10 @@ services:
       dockerfile: Dockerfile
     ports:
       - '8080:8080'
-      - '5432:5432'
+    #   - '5432:5432'
     volumes:
       - ../data/nominatim-data:/var/lib/postgresql/14/main
       # - ../../Nominatim/nominatim/tokenizer/sanitizers:/usr/local/lib/nominatim/lib-python/nominatim/tokenizer/sanitizers
     env_file:
       - ../envs/.env.nominatim
+    restart: always
diff --git a/compose/planet.yml b/compose/planet.yml
index bb0e31c9..c16f9990 100644
--- a/compose/planet.yml
+++ b/compose/planet.yml
@@ -16,6 +16,7 @@ services:
     - ../envs/.env.db
     - ../envs/.env.db-utils
     - ../envs/.env.cloudprovider
+    restart: always
 
   ######################################################
   ### Planet replication section
@@ -32,6 +33,7 @@ services:
     - ../envs/.env.db
     - ../envs/.env.db-utils
     - ../envs/.env.cloudprovider
+    restart: always
 
   #####################################################
   ## OSM full planet replication
@@ -48,6 +50,7 @@ services:
     - ../envs/.env.db
     - ../envs/.env.db-utils
     - ../envs/.env.cloudprovider
+    restart: always
 
   #####################################################
   ## Changeset replications
@@ -65,6 +68,7 @@ services:
     - ../envs/.env.db
     - ../envs/.env.db-utils
     - ../envs/.env.cloudprovider
+    restart: always
 
   ######################################################
   ### NGINX container for serving files
@@ -76,7 +80,7 @@ services:
       dockerfile: Dockerfile
     ports:
     - "8081:80"
-    - "3000:3000"
+    - "8082:3000"
     volumes:
     # Serve minute replication files
     - ../data/replication-job-data:/usr/share/nginx/html/server/static-files/replication/minute
@@ -87,3 +91,7 @@ services:
     - '../data/changeset-replication-job-data:/usr/share/nginx/html/server/static-files/changesets'
     # Development mode
     # - ./../images/planet-files/:/usr/share/nginx/html/
+    restart: always
+networks:
+  osm-seed:
+    driver: bridge
\ No newline at end of file
diff --git a/compose/tasking-manager.yml b/compose/tasking-manager.yml
index 178e87cb..d61b52e0 100644
--- a/compose/tasking-manager.yml
+++ b/compose/tasking-manager.yml
@@ -1,16 +1,33 @@
 version: '3'
 services:
-  ######################################################
-  ### Tasking Manager section
-  ######################################################
-  tasking-manager-api:
+  tmdb:
+    image: mdillon/postgis:11
+    # ports:
+    # - '5432:5432'
+    volumes:
+    - ../data/tasking-manager-db:/db
+    env_file:
+    - ../envs/.env.tasking-manager-db
+    restart: always
+  migration:
     image: osmseed-tasking-manager-api:v1
     build:
       context: ../images/tasking-manager-api
       dockerfile: Dockerfile
+    restart: on-failure
+    command: >
+      sh -c "sleep 10s && python3 manage.py db upgrade"
+    env_file:
+    - ../envs/.env.tasking-manager
+    - ../envs/.env.tasking-manager-db
+  tmapi:
+    build:
+      context: ../images/tasking-manager-api
+      dockerfile: Dockerfile
+    image: osmseed-tasking-manager-api:v1
     ports:
-      - '5000:5000'
-    volumes:
-      - ../data/tasking-manager-api-db:/db
+    - '5000:5000'
     env_file:
-      - ../envs/.env.tasking-manager
\ No newline at end of file
+    - ../envs/.env.tasking-manager
+    - ../envs/.env.tasking-manager-db
+    restart: always
diff --git a/compose/tiler.yml b/compose/tiler.yml
index b94acd66..11d15502 100644
--- a/compose/tiler.yml
+++ b/compose/tiler.yml
@@ -8,8 +8,8 @@ services:
     build:
       context: ../images/tiler-db
       dockerfile: Dockerfile
-    ports:
-    - "5433:5432"
+    # ports:
+    # - "5433:5432"
     volumes:
     - ../data/tiler-db-data:/var/lib/postgresql/data
     env_file:
@@ -42,7 +42,7 @@ services:
       retries: 3
     restart: always
   # ######################################################
-  # ### Tiler imposm for importing data
+  # ### Tiler server
   # ######################################################
   tiler-server:
     image: osmseed-tiler-server:v1
@@ -51,6 +51,7 @@ services:
       dockerfile: Dockerfile
     volumes:
     - ../data/tiler-server-data:/mnt/data
+    - ../data/tiler-imposm-data:/mnt/data/imposm
     depends_on:
     - tiler-db
     - tiler-imposm
@@ -59,8 +60,9 @@ services:
     command:
     - sh
     - -c
-    - "sleep 60 && ./start.sh"
+    - "./start.sh & ./expire-watcher.sh"
     env_file:
     - ../envs/.env.tiler-db
     - ../envs/.env.tiler-server
     restart: always
+  
\ No newline at end of file
diff --git a/compose/web.yml b/compose/web.yml
index ef571d6c..cc6bbf10 100644
--- a/compose/web.yml
+++ b/compose/web.yml
@@ -9,12 +9,13 @@ services:
     build:
       context: ../images/db
       dockerfile: Dockerfile
-    ports:
-    - '5432:5432'
-    # volumes:
-    #   - ../data/db-data:/var/lib/postgresql/data
+    # ports:
+    # - '5432:5432'
+    volumes:
+    - ../data/db-data-pg14:/var/lib/postgresql/data
     env_file:
     - ../envs/.env.db
+    restart: always
   web:
     image: osmseed-web:v1
     build:
@@ -27,3 +28,9 @@ services:
     - ../envs/.env.db
     depends_on:
     - db
+    restart: always
+  memcache:
+    image: memcached:latest
+    ports:
+    - '11211:11211'
+    restart: always
diff --git a/envs/.env.tasking-manager-db.example b/envs/.env.tasking-manager-db.example
new file mode 100644
index 00000000..9176a7d1
--- /dev/null
+++ b/envs/.env.tasking-manager-db.example
@@ -0,0 +1,4 @@
+POSTGRES_DB=tm
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=1234
+POSTGRES_PORT=5432
\ No newline at end of file
diff --git a/envs/.env.tasking-manager.example b/envs/.env.tasking-manager.example
index 902a262c..5887b66e 100644
--- a/envs/.env.tasking-manager.example
+++ b/envs/.env.tasking-manager.example
@@ -37,20 +37,15 @@ POTLATCH2_EDITOR_URL=https://www.openstreetmap.org/edit?editor=potlatch2
 #
 TM_SECRET=xyz
 
-# OpenStreetMap OAuth consumer key and secret (required)
-#
+# OpenStreetMap OAuth 1 consumer key and secret (required)
+
 TM_CONSUMER_KEY=foo
 TM_CONSUMER_SECRET=xyz
 
 TM_DEFAULT_CHANGESET_COMMENT="#{osmseed}-project"
 
 # The connection to the postgres database (required)
-#
-POSTGRES_DB=tm
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=tm
-POSTGRES_ENDPOINT=localhost
-POSTGRES_PORT=5432
+POSTGRES_HOST=tmdb
 
 # The address to use as the sender on auto generated emails (optional)
 #
diff --git a/envs/.env.web.example b/envs/.env.web.example
index 9c720436..81e62ab7 100644
--- a/envs/.env.web.example
+++ b/envs/.env.web.example
@@ -20,16 +20,27 @@ MAILER_USERNAME=test@gmail.com
 MAILER_PASSWORD=abc...
 MAILER_FROM=no-reply@osmseed.org
 MAILER_PORT=25
+OSM_memcache_servers=""
 
 # Nominatim settings
 NOMINATIM_URL=nominatim-api
 
 # Make sure that the first time this (OPENSTREETMAP_id_key) value is empty. 
-# Once you start you server and create your OAuth 1, fill the value with the Consumer Key.
-OPENSTREETMAP_id_key=""
-OSM_memcache_servers=""
+# Once you start you server and create your OAuth 2.
+### Create OAuth 2 applications
+### Client ID=OPENSTREETMAP_id_key
+OPENSTREETMAP_id_key="xyz..."
+
+### OpenStreetMap Web Site
+# Client ID=OAUTH_CLIENT_ID
+# Client Secret=OAUTH_KEY	
+OAUTH_CLIENT_ID="abc..."
+OAUTH_KEY="efg..."
 
 # NEW_RELIC settings
 # TODO: Needs to be implemented the New Relic functions in order to make running in the web container
 NEW_RELIC_LICENSE_KEY="..."
 NEW_RELIC_APP_NAME="..."
+
+### Set organization name, by default : OpenStreetMap
+ORGANIZATION_NAME=OSMSeed
diff --git a/images/backup-restore/start.sh b/images/backup-restore/start.sh
index 2648f321..e9fa1240 100755
--- a/images/backup-restore/start.sh
+++ b/images/backup-restore/start.sh
@@ -63,7 +63,7 @@ restoreDB() {
 		wget -O ${RESTORE_FILE} ${RESTORE_URL_FILE}
 		echo "Restoring ${RESTORE_URL_FILE} in ${POSTGRES_DB}"
 		gunzip -c <${RESTORE_FILE} | psql -h ${POSTGRES_HOST} -U ${POSTGRES_USER} -d ${POSTGRES_DB} | tee ${LOG_RESULT_FILE}
-		aws s3 cp ${LOG_RESULT_FILE} s3://${AWS_S3_BUCKET}/${LOG_RESULT_FILE}
+		# aws s3 cp ${LOG_RESULT_FILE} s3://${AWS_S3_BUCKET}/${LOG_RESULT_FILE}
 		echo "Import data to ${POSTGRES_DB} has finished ..."
 	done
 }
diff --git a/images/db/Dockerfile b/images/db/Dockerfile
index c9a5c1e7..a7e6a566 100644
--- a/images/db/Dockerfile
+++ b/images/db/Dockerfile
@@ -1,25 +1,18 @@
-FROM postgres:11
-RUN rm /etc/apt/sources.list.d/pgdg.list
-RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list
-RUN sed -i 's|security.debian.org|archive.debian.org|g' /etc/apt/sources.list 
-RUN sed -i '/stretch-updates/d' /etc/apt/sources.list 
-RUN apt-get update && apt-get -y install apt-transport-https
-RUN echo "deb [ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] https://apt-archive.postgresql.org/pub/repos/apt/ stretch-pgdg main 11" >/etc/apt/sources.list.d/pgdg.list
+FROM postgres:14
 RUN apt-get update \
     && apt-get install -y \
-    postgresql-server-dev-11 \
+    postgresql-server-dev-14 \
     make \
     build-essential \
-    postgresql-11-postgis-2.5 \
+    postgresql-14-postgis-3 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
-    
+
 ADD functions/functions.sql /usr/local/share/osm-db-functions.sql
 ADD docker_postgres.sh /docker-entrypoint-initdb.d/
 RUN mkdir -p db
 RUN mkdir -p lib
 ADD functions/ db/functions/
 ADD lib/quad_tile/ lib/quad_tile/
-
 RUN make -C db/functions/
 RUN chown -R postgres lib/
-RUN chown -R postgres db/
+RUN chown -R postgres db/
\ No newline at end of file
diff --git a/images/planet-files/index.html b/images/planet-files/index.html
index b1b9a205..4c1eac05 100644
--- a/images/planet-files/index.html
+++ b/images/planet-files/index.html
@@ -22,7 +22,7 @@
     <script>
       // const API_FILES = "http://localhost:3000";
       const HOST_NAME= window.location.hostname
-      const API_FILES = `http://${HOST_NAME}:3000`;
+      const API_FILES = "API_FILES_SERVICES";
       document.title = HOST_NAME;
       async function fetchFiles(directory) {
         const response = await fetch(`${API_FILES}/${directory}`);
diff --git a/images/tiler-server/Dockerfile b/images/tiler-server/Dockerfile
index 10df7d19..64255bff 100644
--- a/images/tiler-server/Dockerfile
+++ b/images/tiler-server/Dockerfile
@@ -10,7 +10,7 @@ RUN apk add musl-dev=1.1.24-r3 \
 
 RUN mkdir -p /go/src/github.com/go-spatial/tegola
 RUN git clone https://github.com/go-spatial/tegola.git /go/src/github.com/go-spatial/tegola
-RUN cd /go/src/github.com/go-spatial/tegola && git checkout v0.8.1
+RUN cd /go/src/github.com/go-spatial/tegola && git checkout v0.13.0
 RUN cd /go/src/github.com/go-spatial/tegola/cmd/tegola \
 	&& go build -gcflags "-N -l" -o /opt/tegola \ 
 	&& chmod a+x /opt/tegola
@@ -36,7 +36,7 @@ RUN pip3 install awscli
 RUN curl -sSL https://sdk.cloud.google.com | bash
 RUN ln -f -s /root/google-cloud-sdk/bin/gsutil /usr/bin/gsutil
 
-RUN pip install mercantile \
+RUN pip3 install mercantile \
     && apk del build-deps \
     && rm -rf /var/cache/apk/* \
     && apk --purge -v del py-pip
diff --git a/images/tiler-server/expire-watcher.sh b/images/tiler-server/expire-watcher.sh
index ef866b13..e0613fb1 100755
--- a/images/tiler-server/expire-watcher.sh
+++ b/images/tiler-server/expire-watcher.sh
@@ -10,6 +10,6 @@ while true ; do
   if [ "$sum" != "$new_sum" ]; then
     ./seed-by-diffs.sh
   else
-    sleep 1
+    sleep 30s
   fi
 done
\ No newline at end of file
diff --git a/images/tiler-server/seed-by-diffs.sh b/images/tiler-server/seed-by-diffs.sh
index 7963b6f1..0116429e 100755
--- a/images/tiler-server/seed-by-diffs.sh
+++ b/images/tiler-server/seed-by-diffs.sh
@@ -16,49 +16,32 @@ completed_jobs=$workDir/imposm/completed.list
 completed_dir=$workDir/imposm/imposm3_expire_purged
 mkdir -p $completed_dir
 
-
 # List files in expire_dir
-imp_list=`find $expire_dir -name '*.tiles' -type f`
+imp_list=$(find $expire_dir -name '*.tiles' -type f)
 
 for f in $imp_list; do
-    echo "$f" >> $queued_jobs
+    echo "$f" >>$queued_jobs
 done
 
 # Sort the files and set unique rows
-if [ -f $queued_jobs ] ; then
-    sort -u $queued_jobs > $workDir/imposm/tmp.list && mv $workDir/imposm/tmp.list $queued_jobs
+if [ -f $queued_jobs ]; then
+    sort -u $queued_jobs >$workDir/imposm/tmp.list && mv $workDir/imposm/tmp.list $queued_jobs
 fi
 
 for f in $imp_list; do
-    echo "seeding from $f"
-    # Read each line on the tiles file
-    while IFS= read -r tile
-    do
-        bounds="$(python tile2bounds.py $tile)"
-        echo tegola cache purge \
-        --config=/opt/tegola_config/config.toml \
-        --min-zoom=0 --max-zoom=20 \
-        --bounds=$bounds \
-        tile-name=$tile
-        
-        tegola cache purge \
+    # echo "Purge tiles from...$f"
+    tegola cache purge tile-list $f \
         --config=/opt/tegola_config/config.toml \
-        --min-zoom=0 --max-zoom=20 \
-        --bounds=$bounds \
-        tile-name=$tile
-        err=$?
-        if [[ $err != "0" ]]; then
-            #error
-            echo "tegola exited with error code $err"
-            # rm $queued_jobs
-            exit
-        fi
-    done < "$f"
-    echo "$f" >> $completed_jobs
+        --format="/zxy" \
+        --min-zoom=0 \
+        --max-zoom=20 \
+        --overwrite=true &
+    sleep 10s
+    echo "$f" >>$completed_jobs
     mv $f $completed_dir
 done
 
-if [ -f $queued_jobs ] ; then
-    echo "finished seeding"
+if [ -f $queued_jobs ]; then
+    # Completed queued jobs
     rm $queued_jobs
 fi
diff --git a/images/web/Dockerfile b/images/web/Dockerfile
index 0a1e5fb8..f880e6fe 100644
--- a/images/web/Dockerfile
+++ b/images/web/Dockerfile
@@ -1,71 +1,42 @@
-FROM ubuntu:20.04
-
+FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND=noninteractive
-ENV RUBY_MAJOR 3.0
-ARG RUBY_VERSION=3.0.6
-ENV RUBY_VERSION $RUBY_VERSION
-ENV PATH /opt/ruby/bin:$PATH:/opt/rbenv/plugins/ruby-build/bin
-
-# ruby-build
-RUN set -ex \
-  && mkdir -p /etc/network/interfaces.d \
-  && BaseDeps=' \
-        git \
-        gcc \
-        autoconf \
-        bison \
-        build-essential \
-        libssl-dev \
-        libyaml-dev \
-        libreadline6-dev \
-        zlib1g-dev \
-        libncurses5-dev \
-        libffi-dev \
-        libgdbm6 \
-        libgdbm-dev \
-        make \
-        wget \
-        curl \
-        iproute2 \
-        net-tools \
-        tzdata \
-        locales \
-        ca-certificates' \
-  && apt-get update \
-  && DEBCONF_NOWARNINGS=yes apt-get -y upgrade \
-  && DEBCONF_NOWARNINGS=yes DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends $BaseDeps \
-  && rm -rf /var/lib/apt/lists/* \
-	&& git clone https://github.com/sstephenson/ruby-build.git /opt/rbenv/plugins/ruby-build \
-  && ruby-build ${RUBY_VERSION} /opt/ruby
-
 ENV workdir /var/www
+
+# Production OSM setup
 ENV RAILS_ENV=production
 
 # Install the openstreetmap-website dependencies
-RUN apt-get update \ 
+RUN apt-get update \
     && apt-get install -y \
-    libmagickwand-dev libxml2-dev libxslt1-dev \
-    nodejs npm libv8-dev apache2 apache2-dev build-essential git-core postgresql-client \
-    libpq-dev libsasl2-dev imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev yarnpkg curl unzip \
+    ruby ruby-dev ruby-bundler libmagickwand-dev libxml2-dev libxslt1-dev \
+    apache2 apache2-dev build-essential git-core postgresql-client \
+    libpq-dev libsasl2-dev imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev curl \
+    default-jre-headless file gpg-agent libvips-dev locales software-properties-common tzdata unzip \
+    advancecomp gifsicle libjpeg-progs jhead jpegoptim optipng pngcrush pngquant libyaml-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Install openstreetmap-cgimap requiriments
-RUN apt-get update \
-    && apt-get -y install \
-    libxml2-dev libpqxx-dev libfcgi-dev zlib1g-dev \
-    libboost-dev libboost-program-options-dev libboost-filesystem-dev \
-    libboost-system-dev libboost-locale-dev libmemcached-dev \
-    libcrypto++-dev libargon2-dev libyajl-dev automake autoconf libtool \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+## Install node
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN apt-get update && apt-get install -y nodejs yarn && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install openstreetmap-cgimap requirements
+RUN apt-get update &&  apt-get -y install libpqxx-dev libfcgi-dev zlib1g-dev \
+  libboost-dev libboost-program-options-dev libfmt-dev \
+  libmemcached-dev libcrypto++-dev libargon2-dev libyajl-dev \
+  automake autoconf libtool && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/*
 
-    
 # Install cgimap
 ENV cgimap /tmp/openstreetmap-cgimap
+ENV CGIMAP_GITSHA=5cd3d21bebe9d205828608be4c65bbda8b464308
 RUN git clone -b master https://github.com/zerebubuth/openstreetmap-cgimap.git $cgimap
-# openstreetmap-cgimap version at Jun 21, 2021
-RUN cd $cgimap && git checkout v0.8.6
+RUN cd $cgimap && git checkout $CGIMAP_GITSHA
 RUN cd $cgimap && \
     ./autogen.sh && \
     ./configure && \
@@ -78,69 +49,63 @@ RUN npm install -g svgo
 # Install openstreetmap-website
 RUN rm -rf $workdir/html
 
-ENV OPENSTREETMAP_WEBSITE_GITSHA=c24b5481812aba9e83da1fd855ccb37f92c5d75e
+## Sep 2023
+ENV OPENSTREETMAP_WEBSITE_GITSHA=d23763d6cdbf5ec11f0e83f8e6e8fb32ed973e6a
 RUN curl -L https://github.com/openstreetmap/openstreetmap-website/archive/$OPENSTREETMAP_WEBSITE_GITSHA.zip --output website.zip && unzip website.zip 
 RUN mv openstreetmap-website-$OPENSTREETMAP_WEBSITE_GITSHA/* $workdir/
 WORKDIR $workdir
-RUN echo "gem 'image_optim_pack', :git => 'https://github.com/toy/image_optim_pack.git'" >> Gemfile
 
 # Install Ruby packages
 RUN gem install bundler && bundle install
 
-
 # Configure database.yml and secrets.yml
 RUN cp $workdir/config/example.database.yml $workdir/config/database.yml
 RUN touch $workdir/config/settings.local.yml
 RUN cp $workdir/config/example.storage.yml $workdir/config/storage.yml
 RUN echo "#session key \n\
 production: \n\
-  secret_key_base: $(bundle exec rake secret)" > $workdir/config/secrets.yml
+  secret_key_base: $(rails secret)" > $workdir/config/secrets.yml
 # Protect sensitive information
 RUN chmod 600 $workdir/config/database.yml $workdir/config/secrets.yml
-RUN bundle exec rake yarn:install
-RUN bundle exec rake i18n:js:export
-RUN bundle exec rake assets:precompile
+RUN bundle exec bin/yarn install
+
+RUN rails i18n:js:export assets:precompile
 
 # The rack interface requires a `tmp` directory to use openstreetmap-cgimap
 RUN ln -s /tmp /var/www/tmp
 
 # Add Apache configuration file
 ADD config/production.conf /etc/apache2/sites-available/production.conf
+RUN a2enmod headers
+RUN a2enmod setenvif
 RUN a2dissite 000-default
 RUN a2ensite production
 
 # Install Passenger + Apache module
-RUN apt-get update && apt-get install -y libapache2-mod-passenger
+RUN apt-key adv --refresh-keys --keyserver keyserver.ubuntu.com
+RUN apt-get update && apt-get install -y libapache2-mod-passenger lighttpd
 
 # Enable the Passenger Apache module and restart Apache
 RUN echo "ServerName $(cat /etc/hostname)" >> /etc/apache2/apache2.conf
 RUN a2enmod passenger
 
-# # Check installation
-# RUN /usr/bin/passenger-config validate-install
-# RUN /usr/sbin/passenger-memory-stats
+# Check installation
+RUN /usr/bin/passenger-config validate-install
+RUN /usr/sbin/passenger-memory-stats
 
 # Enable required apache modules for the cgimap Apache service
-RUN a2enmod proxy proxy_http rewrite
+RUN a2enmod proxy proxy_http rewrite lbmethod_byrequests proxy_fcgi
 
 # Config the virtual host apache2
-ADD config/cgimap.conf /tmp/
-RUN sed -e 's/RewriteRule ^(.*)/#RewriteRule ^(.*)/' \
-        -e 's/\/var\/www/\/var\/www\/public/g' \
-        /tmp/cgimap.conf > /etc/apache2/sites-available/cgimap.conf
-RUN chmod 644 /etc/apache2/sites-available/cgimap.conf
-RUN a2ensite cgimap
 RUN apache2ctl configtest
 
 # Set Permissions for www-data
 RUN chown -R www-data: $workdir
 
 # Add settings
-ADD config/settings.yml $workdir/config/settings.yml
+ADD config/settings.yml $workdir/config/
 
 COPY start.sh $workdir/
 COPY liveness.sh $workdir/
 
 CMD $workdir/start.sh
-
-
diff --git a/images/web/config/cgimap.conf b/images/web/config/cgimap.conf
deleted file mode 100644
index 059cab88..00000000
--- a/images/web/config/cgimap.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-# An Apache configuration file to direct requests to cgimap or to a rails port
-# API server, depending on if cgimap can handle the request. It assumes cgimap
-# is running on port 8000 and that /var/www is the DocumentRoot
-# Requires mod_rewrite, mod_proxy and mod_proxy_http
-
-# Adjust as needed for the DocumentRoot. You will need to create the api
-# directory, but nothing need be in it.
-<Directory /var/www/public>
-    # This section could be placed in a .htaccess file in /var/www/public, but
-    # the ProxyPreserveHost directive can't. If you don't have access to the
-    # apache config you won't be able to get OAuth to work
-
-    # Enable rewrites
-    RewriteEngine on
-
-    # Rewrite calls which there is only a GET version and all request methods
-    # can go to cgimap.
-    RewriteRule ^0\.6/map$ - [L,H=fcgi:127.0.0.1:8000]
-    RewriteRule ^0\.6/(nodes|ways|relations)$ - [L,H=fcgi:127.0.0.1:8000]
-    RewriteRule ^0\.6/(way|relation)/([^/]+)/full$ - [L,H=fcgi:127.0.0.1:8000]
-
-    # Cgimap has experimental support for these calls. Uncomment to use them
-    # RewriteRule ^0\.6/node/([^/]+)/ways$ - [L,H=fcgi:127.0.0.1:8000]
-
-    # Calls where we only want to direct the GET version to cgimap, not all
-    # versions. Also note that this won't capture node/#/history which aren't
-    # handled by cgimap.
-    RewriteCond %{REQUEST_METHOD} ^(GET|HEAD)$
-    RewriteRule ^0\.6/(node|way|relation)/([^/]+)$ - [L,H=fcgi:127.0.0.1:8000]
-
-    # Fall-through to the main API server running the rails port to take calls
-    # not handled by cgimap.
-    RewriteRule ^(.*) http://api.openstreetmap.org/api/$1 [P]
-</Directory>
-
-# Required for OAuth to work. The Host header is used to generate the OAuth
-# signature so we can't modify it.
-
-# This relies on api.openstreetmap.org accepting requests with a Host header
-# that doesn't match a domain actually pointed to it.
-ProxyPreserveHost On
diff --git a/images/web/config/production.conf b/images/web/config/production.conf
index 34dcb9e3..37c2cfc8 100644
--- a/images/web/config/production.conf
+++ b/images/web/config/production.conf
@@ -2,15 +2,49 @@
     # ServerName localhost
     # Tell Apache and Passenger where your app's 'public' directory is
     DocumentRoot /var/www/public
-    PassengerRuby /opt/ruby/bin/ruby
-
+    PassengerRuby /usr/bin/ruby
     RewriteEngine On
     RewriteCond %{HTTP:X-Forwarded-Proto} =http
-    # RewriteRule .* https://%{HTTP:Host}%{REQUEST_URI} [L,R=permanent]
+    #  Development mode in case domain is localhost
+
+    # ======Redirect to HTTPS
+    RewriteCond %{HTTP_HOST} !=localhost
+    RewriteCond %{HTTP_HOST} !=127.0.0.1
+    # RewriteCond %{HTTPS} off
+    # RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+
+    # ======Redirect to wwww osmseed.org
+    # RewriteCond %{HTTP_HOST} =osmseed.org
+    # RewriteCond %{HTTP_HOST} !^www\. [NC]
+    # RewriteRule .* https://www.%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+
+    # <Location />
+    #     # For TM, do not use cgimap auth.
+    #     <If "%{HTTP_REFERER} !~ m#https://tasks(-\w+)?\.osmseed\.org/#">
+    #         CGIPassAuth On
+    #     </If>
+    # </Location>
+
+    # ======Proxying traffic to CGImap====
+    # RewriteCond %{REQUEST_URI} ^/api/0\.6/map
+    # RewriteRule ^/api/0\.6/map(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+    # RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$
+    # RewriteRule ^/api/0\.6/(node|way|relation|changeset)/[0-9]+(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+    # RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/history(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+    # RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/relations(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+    # RewriteRule ^/api/0\.6/node/[0-9]+/ways(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+    # RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+    # RewriteRule ^/api/0\.6/(nodes|ways|relations)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+
+    # For changeset requests originating from TM, do not use cgimap.
+    # RewriteCond %{REQUEST_METHOD} ^POST$
+    # RewriteCond %{HTTP_REFERER} !^https://tasks(-\w+)?\.osmseed\.org/ [NC]
+    # RewriteRule ^/api/0\.6/changeset/[0-9]+/(upload|download)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
 
     # Relax Apache security settings
     <Directory /var/www/public>
+      AllowOverride None
       Allow from all
       Options -MultiViews
     </Directory>
-</VirtualHost>
\ No newline at end of file
+</VirtualHost>
diff --git a/images/web/config/settings.yml b/images/web/config/settings.yml
index 494bcb49..ce42d9e5 100644
--- a/images/web/config/settings.yml
+++ b/images/web/config/settings.yml
@@ -1,4 +1,3 @@
-
 # The server protocol and host
 server_protocol: "http"
 server_url: "openstreetmap.example.com"
@@ -28,30 +27,54 @@ status: "online"
 max_request_area: 0.25
 # Number of GPS trace/trackpoints returned per-page
 tracepoints_per_page: 5000
+# Default limit on the number of changesets returned by the changeset query api method
+default_changeset_query_limit: 100
+# Maximum limit on the number of changesets returned by the changeset query api method
+max_changeset_query_limit: 100
 # Maximum number of nodes that will be returned by the api in a map request
 max_number_of_nodes: 50000
 # Maximum number of nodes that can be in a way (checked on save)
 max_number_of_way_nodes: 2000
+# Maximum number of members that can be in a relation (checked on save)
+max_number_of_relation_members: 32000
 # The maximum area you're allowed to request notes from, in square degrees
 max_note_request_area: 25
+# Default limit on the number of notes returned by the note search api method
+default_note_query_limit: 100
+# Maximum limit on the number of notes returned by the note search api method
+max_note_query_limit: 10000
+# Maximum value of open issues counter for moderators, anything equal or greater to this value "n" is shown as "n+"
+max_issues_count: 99
+# Maximum number of points in a GPX trace
+max_trace_size: 1000000
 # Zoom level to use for postcode results from the geocoder
 postcode_zoom: 15
-# Zoom level to use for geonames results from the geocoder
-geonames_zoom: 12
 # Timeout for API calls in seconds
 api_timeout: 300
 # Timeout for web pages in seconds
 web_timeout: 30
 # Periods (in hours) which are allowed for user blocks
 user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96, 168, 336, 731, 4383, 8766, 87660]
+# Account deletion cooldown period (in hours) since last changeset close; null to disable, 0 to make sure there aren't any open changesets when the deletion happens
+user_account_deletion_delay: null
 # Rate limit for message sending
 max_messages_per_hour: 60
 # Rate limit for friending
 max_friends_per_hour: 60
+# Rate limit for changeset comments
+min_changeset_comments_per_hour: 1
+initial_changeset_comments_per_hour: 6
+max_changeset_comments_per_hour: 60
+moderator_changeset_comments_per_hour: 36000
+# Rate limit for changes
+min_changes_per_hour: 100
+initial_changes_per_hour: 1000
+max_changes_per_hour: 100000
+days_to_max_changes: 7
+importer_changes_per_hour: 1000000
+moderator_changes_per_hour: 1000000
 # Domain for handling message replies
 #messages_domain: "messages.openstreetmap.org"
-# Geonames authentication details
-#geonames_username: ""
 # MaxMind GeoIPv2 database
 #maxmind_database: ""
 # Users to show as being nearby
@@ -64,9 +87,6 @@ spam_threshold: 50
 diary_feed_delay: 0
 # Default legale (jurisdiction location) for contributor terms
 default_legale: GB
-# Location of GPX traces and images
-gpx_trace_dir: "/home/osm/traces"
-gpx_image_dir: "/home/osm/images"
 # Location of data for attachments
 attachments_dir: ":rails_root/public/attachments"
 # Log file to use
@@ -75,44 +95,45 @@ attachments_dir: ":rails_root/public/attachments"
 #logstash_path: ""
 # List of memcache servers to use for caching
 #memcache_servers: []
+# Enable HTTP basic authentication support
+basic_auth_support: true
 # Enable legacy OAuth 1.0 support
 oauth_10_support: true
+oauth_10_registration: true
 # URL of Nominatim instance to use for geocoding
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 default_editor: "id"
 # OAuth application for the web site
-#oauth_application: ""
-# OAuth consumer key for iD
-#id_key: ""
+oauth_application: "OAUTH_CLIENT_ID"
+oauth_key: "OAUTH_KEY"
+# OAuth application for iD
+id_application: ""
 # Imagery to return in capabilities as blacklisted
-imagery_blacklist:
-  # Current Google imagery URLs have google or googleapis in the domain
-  # with a vt or kh endpoint, and x, y and z query parameters
-  - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*"
-  # Blacklist VWorld
-  - "http://xdworld\\.vworld\\.kr:8080/.*"
-  # Blacklist here
-  - ".*\\.here\\.com[/:].*"
+imagery_blacklist: []
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
+overpass_credentials: false
 # Routing endpoints
 graphhopper_url: "https://graphhopper.com/api/1/route"
 fossgis_osrm_url: "https://routing.openstreetmap.de/"
+fossgis_valhalla_url: "https://valhalla1.openstreetmap.de/route"
 # External authentication credentials
 #google_auth_id: ""
 #google_auth_secret: ""
 #google_openid_realm: ""
 #facebook_auth_id: ""
 #facebook_auth_secret: ""
-#windowslive_auth_id: ""
-#windowslive_auth_secret: ""
 #github_auth_id: ""
 #github_auth_secret: ""
+#microsoft_auth_id: ""
+#microsoft_auth_secret: ""
 #wikipedia_auth_id: ""
 #wikipedia_auth_secret: ""
 # Thunderforest authentication details
 #thunderforest_key: ""
+# Tracestrack authentication details
+#tracestrack_key: ""
 # Key for generating TOTP tokens
 #totp_key: ""
 # Enforce Content-Security-Policy
@@ -134,7 +155,20 @@ trace_icon_storage: "local"
 smtp_address: "localhost"
 smtp_port: 25
 smtp_domain: "localhost"
-smtp_enable_starttls_auto: false
+smtp_enable_starttls_auto: true
+smtp_tls_verify_mode: "none"
 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null
+# Matomo settings for analytics
+#matomo:
+# Signup rate limits
+#signup_ip_per_day:
+#signup_ip_max_burst:
+#signup_email_per_day:
+#signup_email_max_burst:
+# Private key for signing id_tokens
+doorkeeper_signing_key: |
+  -----BEGIN PRIVATE KEY-----
+  PRIVATE_KEY
+  -----END PRIVATE KEY-----
diff --git a/images/web/start.sh b/images/web/start.sh
index 3d5246cb..a852a194 100755
--- a/images/web/start.sh
+++ b/images/web/start.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 workdir="/var/www"
 export RAILS_ENV=production
-#### Because we can not set up many env variable in build process, we are going to process here!
 
 #### SETTING UP THE PRODUCTION DATABASE
 echo " # Production DB
@@ -26,31 +25,62 @@ sed -i -e 's/smtp_user_name: null/smtp_user_name: "'$MAILER_USERNAME'"/g' $workd
 sed -i -e 's/smtp_password: null/smtp_password: "'$MAILER_PASSWORD'"/g' $workdir/config/settings.yml
 sed -i -e 's/openstreetmap@example.com/'$MAILER_FROM'/g' $workdir/config/settings.yml
 sed -i -e 's/smtp_port: 25/smtp_port: '$MAILER_PORT'/g' $workdir/config/settings.yml
+ 
+### SETTING UP UP OAUTH-2 ID KEY FOR iD
+sed -i -e 's/id_application: ""/id_application: "'$OPENSTREETMAP_id_key'"/g' $workdir/config/settings.yml
 
-#### SET UP ID KEY
-sed -i -e 's/#id_key: ""/id_key: "'$OPENSTREETMAP_id_key'"/g' $workdir/config/settings.yml
-
-### SET UP OAUTH ID AND KEY
+### SETTING UP OAUTH-2 ID KEY WEBSITE
 sed -i -e 's/OAUTH_CLIENT_ID/'$OAUTH_CLIENT_ID'/g' $workdir/config/settings.yml
 sed -i -e 's/OAUTH_KEY/'$OAUTH_KEY'/g' $workdir/config/settings.yml
 
-## SET NOMINATIM URL
+#### SETTING UP ENV VARS FOR MEMCACHED SERVER
+sed -i -e 's/#memcache_servers: \[\]/memcache_servers: "'$OPENSTREETMAP_memcache_servers'"/g' $workdir/config/settings.yml
+
+### SETTING UP NOMINATIM URL
 sed -i -e 's/nominatim.openstreetmap.org/'$NOMINATIM_URL'/g' $workdir/config/settings.yml
 
+#### SETTING UP OVERPASS URL
+sed -i -e 's/overpass-api.de/'$OVERPASS_URL'/g' $workdir/config/settings.yml
+sed -i -e 's/overpass-api.de/'$OVERPASS_URL'/g' $workdir/app/views/site/export.html.erb
+sed -i -e 's/overpass-api.de/'$OVERPASS_URL'/g' $workdir/app/assets/javascripts/index/export.js
+
+### SETTING UP ORGANIZATION
+sed -i -e 's/OpenStreetMap/'$ORGANIZATION_NAME'/g' $workdir/config/settings.yml
+ORGANIZATION_NAME_LOWER=$(echo "$ORGANIZATION_NAME" | tr '[:upper:]' '[:lower:]')
+sed -i -e 's/openstreetmap/'"$ORGANIZATION_NAME_LOWER"'/g' "$workdir/config/settings.yml"
+
+### ADDING DOORKEEPER_SIGNING_KEY
+openssl genpkey -algorithm RSA -out private.pem
+chmod 400 /var/www/private.pem
+export DOORKEEPER_SIGNING_KEY=$(cat /var/www/private.pem | sed -e '1d;$d' | tr -d '\n')
+sed -i "s#PRIVATE_KEY#${DOORKEEPER_SIGNING_KEY}#" $workdir/config/settings.yml
+
 #### CHECK IF DB IS ALREADY UP AND START THE APP
 flag=true
+site_loading=true
+
 while "$flag" = true; do
   pg_isready -h $POSTGRES_HOST -p 5432 >/dev/null 2>&2 || continue
   flag=false
-  # Print the log while compiling the assets
+
   until $(curl -sf -o /dev/null $SERVER_URL); do
-    echo "Waiting to start rails ports server..."
+    if [ "$site_loading" = true ]; then
+      echo "Waiting to start Rails ports server..."
+      site_loading=false
+    fi
     sleep 2
   done &
-
-  # bundle exec rake assets:precompile --trace
+  # time rails i18n:js:export assets:precompile
   bundle exec rails db:migrate
-  # Start the delayed jobs queue worker and  Start the app
+  # /usr/local/bin/openstreetmap-cgimap \
+  #   --port=8000 \
+  #   --daemon \
+  #   --instances=10 \
+  #   --dbname=$POSTGRES_DB \
+  #   --host=$POSTGRES_HOST \
+  #   --username=$POSTGRES_USER \
+  #   --password=$POSTGRES_PASSWORD \
+  #   --logfile log/cgimap.log
   bundle exec rake jobs:work &
   apachectl -k start -DFOREGROUND
 done
diff --git a/osm-seed/templates/web/web-deployment.yaml b/osm-seed/templates/web/web-deployment.yaml
index f154c5cb..fc44928a 100644
--- a/osm-seed/templates/web/web-deployment.yaml
+++ b/osm-seed/templates/web/web-deployment.yaml
@@ -119,6 +119,8 @@ spec:
               value: {{ .Values.web.env.NEW_RELIC_LICENSE_KEY | default ""}}
             - name: NEW_RELIC_APP_NAME
               value: {{ .Values.web.env.NEW_RELIC_APP_NAME | default ""}}
+            - name: ORGANIZATION_NAME
+              value: {{ .Values.web.env.ORGANIZATION_NAME | default "OpenStreetMap"}}
           volumeMounts:
             - mountPath: /dev/shm
               name: shared-memory
diff --git a/osm-seed/values.yaml b/osm-seed/values.yaml
index 122c95e3..a645df16 100644
--- a/osm-seed/values.yaml
+++ b/osm-seed/values.yaml
@@ -132,6 +132,7 @@ web:
     OVERPASS_URL: "overpassApi"
     OAUTH_CLIENT_ID: "abcd" # Create client ID and key as OAuth2 Application
     OAUTH_KEY: "xyz"
+    ORGANIZATION_NAME: "OSMSeed"
   resources:
     enabled: false
     requests: