diff --git a/resources/credentials.yml b/resources/credentials.yml
index b184cc9..ddf8c05 100644
--- a/resources/credentials.yml
+++ b/resources/credentials.yml
@@ -1,10 +1,10 @@
 ---
+# AWS credentials
 # aws_access_key:
 # aws_secret_key:
 # aws_region:
-# apigee_repo_user:
-# apigee_repo_password:
 # security_group:
+# vpc_id:
 # vpc_subnet_id:
 # name_prefix:
 # key_name:
@@ -19,6 +19,9 @@
 # delete_on_termination:
 # device_name:
 
+# Apigee credentials
+# apigee_repo_user:
+# apigee_repo_password:
 # opdk_user_name:
 # opdk_group_name:
 # opdk_user_email:
@@ -33,12 +36,11 @@
 # pg_user:
 # pg_pass:
 
+# BaaS Credentials
 # baas_admin_name:
-
 # baas_admin_email cannot be the same as  baas_superuser_email
 # baas_admin_email:
 # baas_admin_pass:
-
 # baas_superuser_email cannot be the same as baas_admin_email
 # baas_superuser_email:
 # baas_superuser_name: