diff --git a/Jenkinsfile b/Jenkinsfile
index b7142acfaa..ac679e49a4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ app.build(
     requestCpu: '1',
     limitCpu: '2',
     requestMemory: '6Gi',
-    limitMemory: '12Gi',
+    limitMemory: '14Gi',
   ]
 ) {
   def scmVars
diff --git a/bin/deploy b/bin/deploy
index aa2705413d..06a9bebad7 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -23,13 +23,13 @@ extraBindings="{\"ingress\":{\"hosts\":[\"${deploy_url}\"]}}"
 
 krane render \
     --filenames=${workDir}/config/deploy/templates \
-    --bindings="@${workDir}/config/deploy/values.yaml" "@${workDir}/config/deploy/${environment}/values.yaml" "@${workDir}/config/deploy/${environment}/secrets.dec.yaml" "image_tag=${tag}" "environment=${environment}" $extraBindings \
+    --bindings="@${workDir}/config/deploy/values.yaml" $environmentValuesFile $environmentSecretsFile "image_tag=${tag}" "environment=${environment}" $extraBindings \
     --current-sha=${tag} | krane deploy playbook-${environment} ${cluster} \
     --selector='app=playbook' \
     --verbose-log-prefix \
     --stdin
 
 deploy_exit=$?
-rm ${workDir}/config/deploy/${environment}/secrets.dec.yaml
+rm ${workDir}/config/deploy/**/*.dec.yaml
 
 exit $deploy_exit
diff --git a/config/deploy/production/values.yaml b/config/deploy/production/values.yaml
index 73b314ff7c..9e26dfeeb6 100644
--- a/config/deploy/production/values.yaml
+++ b/config/deploy/production/values.yaml
@@ -1 +1 @@
----
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/config/deploy/prs/values.yaml b/config/deploy/prs/values.yaml
index 73b314ff7c..9e26dfeeb6 100644
--- a/config/deploy/prs/values.yaml
+++ b/config/deploy/prs/values.yaml
@@ -1 +1 @@
----
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/config/deploy/staging/values.yaml b/config/deploy/staging/values.yaml
index 73b314ff7c..9e26dfeeb6 100644
--- a/config/deploy/staging/values.yaml
+++ b/config/deploy/staging/values.yaml
@@ -1 +1 @@
----
\ No newline at end of file
+{}
\ No newline at end of file