diff --git a/docs/src/main/asciidoc/adapters/aws.adoc b/docs/src/main/asciidoc/adapters/aws.adoc
index fb0c51131..0912ded38 100644
--- a/docs/src/main/asciidoc/adapters/aws.adoc
+++ b/docs/src/main/asciidoc/adapters/aws.adoc
@@ -37,6 +37,13 @@ public class FuncApplication implements ApplicationContextInitializer<GenericApp
 }
 ```
 
+== AWS Context
+
+In a typical implementation of AWS Handler user has access to AWS _context_ object. With function approach you can have the same experience if you need it.
+Upon each invocation the framework will add `aws-context` message header containing the AWS _context_ instance for that particular invocation. So if you need to access it 
+you can simply have `Message<YourPojo>` as an input parameter to your function and then access `aws-context` from message headers. 
+For convenience we provide AWSLambdaUtils.AWS_CONTEXT constant.
+
 == Platform Specific Features
 
 === HTTP and API Gateway
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
index 3eb2a9f72..5fd4dda97 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
@@ -51,6 +51,8 @@ final class AWSLambdaUtils {
 
 	static final String AWS_API_GATEWAY = "aws-api-gateway";
 
+	public static final String AWS_CONTEXT = "aws-context";
+
 	private AWSLambdaUtils() {
 
 	}
@@ -136,7 +138,7 @@ final class AWSLambdaUtils {
 			messageBuilder = MessageBuilder.withPayload(payload);
 		}
 		if (awsContext != null) {
-			messageBuilder.setHeader("aws-context", awsContext);
+			messageBuilder.setHeader(AWS_CONTEXT, awsContext);
 		}
 		logger.info("Incoming request headers: " + headers);