diff --git a/config.template/faf-website/faf-website.env b/config.template/faf-website/faf-website.env
index bc390746..3ac100b2 100644
--- a/config.template/faf-website/faf-website.env
+++ b/config.template/faf-website/faf-website.env
@@ -1,24 +1,16 @@
 NODE_ENV=development
-WP_URL=http://faf-wordpress/wp-json
-WP_NEWSHUB_CATEGORYID=283                      # define a category in wordpress to show posts on newshub
-WP_NEWSHUBARCHIVE_CATEGORYID=284               # define a category in wordpress to hide old newshub posts
-CHALLONGE_USERNAME=
-CHALLONGE_APIKEY=
 PORT=4000
+HOST=http://localhost:8020
 API_URL=http://faf-java-api:8010
-LOBBY_API_URL=http://faf-python-server:4000
 OAUTH_URL=http://localhost:4444                # If you don't want to run your own Ory Hydra / user service, you can use https://hydra.test.faforever.com
+WP_URL=http://faf-wordpress
+
 OAUTH_CLIENT_ID=faf-website
 OAUTH_CLIENT_SECRET=banana
-HOST=http://localhost:8020
 SESSION_SECRET_KEY=banana
 RECAPTCHA_SITE_KEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
 
 TOKEN_LIFESPAN=43200                      # an api token is valid for 12h
-LEAGUES_UPDATE_INTERVAL=3600              # one hour
-LEADERBOARDS_UPDATE_INTERVAL=900          # 15 minutes
-RECENT_USERS_LIST_UPDATE_INTERVAL=900     # 15 minutes
-CLIENT_RELEASE_FETCHING_INTERVAL=900      # 15 minutes
-CLAN_LIST_UPDATE_INTERVAL=900             # 15 minutes
-PLAYER_COUNT_UPDATE_INTERVAL=10           # 10 seconds
-CLAN_INVITES_LIFESPAN_DAYS=30				      # 30 days before minified clan links are cleared from memory after being GET once. Reduce this value if website uses too much memory
+CLAN_INVITES_LIFESPAN_DAYS=30				      # 30 days
+EXTRACTOR_INTERVAL= 5 # 5 minutes
+PLAYER_COUNT_INTERVAL= 15           # 15 seconds
diff --git a/docker-compose.yml b/docker-compose.yml
index b0826438..b689fc78 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -149,7 +149,7 @@ services:
   #
   faf-website:
     container_name: faf-website
-    image: faforever/faf-website:v1.15.4
+    image: faforever/faf-website:v2.0.4
     user: ${FAF_WEBSITE_USER}
     restart: unless-stopped
     env_file: ./config/faf-website/faf-website.env