diff --git a/metadata.json b/metadata.json
index 631d1ae2..750e73a7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 7.0.0"
+      "version_requirement": ">= 4.13.1 < 9.0.0"
     }
   ],
   "operatingsystem_support": [
diff --git a/templates/opt/graphite/webapp/graphite/local_settings.py.erb b/templates/opt/graphite/webapp/graphite/local_settings.py.erb
index 3ddd1344..734ef920 100644
--- a/templates/opt/graphite/webapp/graphite/local_settings.py.erb
+++ b/templates/opt/graphite/webapp/graphite/local_settings.py.erb
@@ -66,6 +66,9 @@ CACHES = {
 URL_PREFIX = "<%= scope.lookupvar('graphite::gr_web_url_prefix') %>"
 <% end -%>
 
+FETCH_TIMEOUT = <%= scope.lookupvar('graphite::gr_cluster_fetch_timeout') %>
+FIND_TIMEOUT = <%= scope.lookupvar('graphite::gr_cluster_find_timeout') %>
+
 #####################################
 # Filesystem Paths #
 #####################################
@@ -241,8 +244,6 @@ CLUSTER_SERVERS = ['<%= scope.lookupvar('graphite::gr_cluster_servers').join("',
 # Remote cluster settings config names changed in Graphite 1.0.
 # See https://github.com/echocat/puppet-graphite/pull/356 for more info
 <% if scope.lookupvar('graphite::version_1') >= 0 %>
-REMOTE_FETCH_TIMEOUT = <%= scope.lookupvar('graphite::gr_cluster_fetch_timeout') %>
-REMOTE_FIND_TIMEOUT = <%= scope.lookupvar('graphite::gr_cluster_find_timeout') %>
 REMOTE_RETRY_DELAY = <%= scope.lookupvar('graphite::gr_cluster_retry_delay') %>
 FIND_CACHE_DURATION = <%= scope.lookupvar('graphite::gr_cluster_cache_duration') %>
 <% else %>