diff --git a/sample-apps/s3-java/5-invoke.sh b/sample-apps/s3-java/5-invoke.sh
index d2ae6adc..d65db099 100755
--- a/sample-apps/s3-java/5-invoke.sh
+++ b/sample-apps/s3-java/5-invoke.sh
@@ -9,7 +9,7 @@ if [ ! -f event.json ]; then
 
 fi
 while true; do
-  aws lambda invoke --function-name $FUNCTION --payload file://event.json out.json --cli-binary-format raw-in-base64-out
+  aws lambda invoke --function-name $FUNCTION --payload file://event.json out.json
   cat out.json
   echo ""
   sleep 2
diff --git a/sample-apps/s3-java/template-mvn.yml b/sample-apps/s3-java/template-mvn.yml
index dff099bc..be8d8527 100644
--- a/sample-apps/s3-java/template-mvn.yml
+++ b/sample-apps/s3-java/template-mvn.yml
@@ -13,7 +13,7 @@ Resources:
       Runtime: java8
       Description: Java function
       MemorySize: 512
-      Timeout: 10
+      Timeout: 30
       # Function's execution role
       Policies:
         - AWSLambdaBasicExecutionRole
diff --git a/sample-apps/s3-java/template.yml b/sample-apps/s3-java/template.yml
index a576f664..c82e5ac0 100644
--- a/sample-apps/s3-java/template.yml
+++ b/sample-apps/s3-java/template.yml
@@ -13,7 +13,7 @@ Resources:
       Runtime: java8
       Description: Java function
       MemorySize: 512
-      Timeout: 10
+      Timeout: 30
       # Function's execution role
       Policies:
         - AWSLambdaBasicExecutionRole