diff --git a/apps/base/puppet/configmap_puppetserver-compiler-config.yaml b/apps/base/puppet/configmap_puppetserver-compiler-config.yaml
index b5a69aa..5db6dd9 100644
--- a/apps/base/puppet/configmap_puppetserver-compiler-config.yaml
+++ b/apps/base/puppet/configmap_puppetserver-compiler-config.yaml
@@ -11,6 +11,7 @@ metadata:
   namespace: puppet
 data:
   OPENVOXSERVER_PORT: "8140"
+  OPENVOXSERVER_ENVIRONMENT_TIMEOUT: "0"
   DNS_ALT_NAMES: "puppetserver-compiler,puppet,puppet.k8s.syd1.au.unkin.net"
   OPENVOXDB_SERVER_URLS: "https://puppetdb:8081"
   CA_ENABLED: "false"
diff --git a/apps/base/puppet/configmap_puppetserver-master-config.yaml b/apps/base/puppet/configmap_puppetserver-master-config.yaml
index 2bf4ce7..346c109 100644
--- a/apps/base/puppet/configmap_puppetserver-master-config.yaml
+++ b/apps/base/puppet/configmap_puppetserver-master-config.yaml
@@ -12,6 +12,7 @@ metadata:
 data:
   OPENVOXSERVER_HOSTNAME: "puppet"
   OPENVOXSERVER_PORT: "8140"
+  OPENVOXSERVER_ENVIRONMENT_TIMEOUT: "0"
   DNS_ALT_NAMES: "puppet,puppetserver-agents-to-puppet,puppetca,puppet-headless,puppetca.k8s.syd1.au.unkin.net,puppet.k8s.syd1.au.unkin.net"
   OPENVOXDB_SERVER_URLS: "https://puppetdb:8081"
   CA_ALLOW_SUBJECT_ALT_NAMES: "true"