diff --git a/.env.sample b/.env.sample
index 8fa51f4..97d62fe 100644
--- a/.env.sample
+++ b/.env.sample
@@ -2,9 +2,9 @@
 #create environment file name as .env.development.local,.env.production.local
 #and place following configuration data.
 
-API_KEY=YOUR_API_KEY
-DELIVERY_TOKEN=YOUR_DELIVERY_TOKEN
-ENVIRONMENT=YOUR_PUBLISHING_ENVIRONMENT
+CONTENTSTACK_API_KEY=YOUR_API_KEY
+CONTENTSTACK_DELIVERY_TOKEN=YOUR_DELIVERY_TOKEN
+CONTENTSTACK_ENVIRONMENT=YOUR_PUBLISHING_ENVIRONMENT
 
-# For setting region add  REGION=(Optional for US region) Eg- eu
-# For setting custom host add CUSTOM_HOST=(Optional)
\ No newline at end of file
+# For setting region add  CONTENTSTACK_REGION=(Optional for US region) Eg- eu
+# For setting custom host add CONTENTSTACK_CUSTOM_HOST=(Optional)
\ No newline at end of file
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..ba5226b
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+
+* @contentstack/security-admin @contentstack/ecosystem-admin
diff --git a/package.json b/package.json
index c70d053..6d1ff03 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "contentstack-nextjs-starter-app",
   "description": "A starter app for Contentstack and Nextjs",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "author": "Contentstack",
   "scripts": {
diff --git a/sdk-plugin/index.js b/sdk-plugin/index.js
index 3ee91ea..c1f8c64 100644
--- a/sdk-plugin/index.js
+++ b/sdk-plugin/index.js
@@ -1,14 +1,14 @@
 const contentstack = require("contentstack");
 
 const Stack = contentstack.Stack({
-  api_key: process.env.API_KEY,
-  delivery_token: process.env.DELIVERY_TOKEN,
-  environment: process.env.ENVIRONMENT,
-  region: process.env.REGION ? process.env.REGION : "us",
+  api_key: process.env.CONTENTSTACK_API_KEY,
+  delivery_token: process.env.CONTENTSTACK_DELIVERY_TOKEN,
+  environment: process.env.CONTENTSTACK_ENVIRONMENT,
+  region: process.env.CONTENTSTACK_REGION ? process.env.CONTENTSTACK_REGION : "us",
 });
 
-if (process.env.CUSTOM_HOST) {
-  Stack.setHost(process.env.CUSTOM_HOST);
+if (process.env.CONTENTSTACK_CUSTOM_HOST) {
+  Stack.setHost(process.env.CONTENTSTACK_CUSTOM_HOST);
 }
 export default {
   /**