diff --git a/server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json b/server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json
index db3986c0f..c8c90977c 100644
--- a/server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json
+++ b/server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json
@@ -4,7 +4,7 @@
     "displayName": "Apache Dashboard",
     "description": "Apache web logs collector",
     "license": "Apache-2.0",
-    "type": "logs",
+    "type": "logs_apache",
     "author": "OpenSearch",
     "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/apache/info",
     "statics": {
@@ -29,7 +29,7 @@
             "version": "1.0.0"
         },
         {
-            "name": "logs-apache",
+            "name": "logs_apache",
             "version": "1.0.0"
         }
     ],
@@ -42,4 +42,4 @@
     "sampleData": {
         "path": "sample.json"
     }
-}
\ No newline at end of file
+}
diff --git a/server/adaptors/integrations/__data__/repository/apache/schemas/logs-apache-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/apache/schemas/logs_apache-1.0.0.mapping.json
similarity index 100%
rename from server/adaptors/integrations/__data__/repository/apache/schemas/logs-apache-1.0.0.mapping.json
rename to server/adaptors/integrations/__data__/repository/apache/schemas/logs_apache-1.0.0.mapping.json
diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json
index 8f5af2957..2f9a07f77 100644
--- a/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json
+++ b/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json
@@ -4,7 +4,7 @@
     "displayName": "AWS ELB",
     "description": "AWS Elastic Load Balancer collector",
     "license": "Apache-2.0",
-    "type": "logs",
+    "type": "logs_elb",
     "author": "OpenSearch",
     "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_elb/info",
     "statics": {
@@ -41,7 +41,7 @@
             "version": "1.0.0"
         },
         {
-            "name": "logs-elb",
+            "name": "logs_elb",
             "version": "1.0.0"
         }
     ],
@@ -54,4 +54,4 @@
     "sampleData": {
         "path": "sample.json"
     }
-}
\ No newline at end of file
+}
diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs-elb-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs_elb-1.0.0.mapping.json
similarity index 99%
rename from server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs-elb-1.0.0.mapping.json
rename to server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs_elb-1.0.0.mapping.json
index 7118a96ee..c4a75762f 100644
--- a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs-elb-1.0.0.mapping.json
+++ b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs_elb-1.0.0.mapping.json
@@ -1,6 +1,6 @@
 {
     "index_patterns": [
-      "ss4o_logs-elb-*"
+      "ss4o_logs-aws_elb-*"
     ],
     "data_stream": {},
     "template": {
@@ -246,4 +246,4 @@
         }
       ]
     }
-  }
\ No newline at end of file
+  }
diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json
index 86e8a9b03..cffc317ef 100644
--- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json
+++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json
@@ -37,7 +37,7 @@
       "version": "1.0.0"
     },
     {
-      "name": "s3",
+      "name": "aws_s3",
       "version": "1.0.0"
     }
   ],
diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/info/README.md b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/info/README.md
index 6e5580466..af6635934 100644
--- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/info/README.md
+++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/info/README.md
@@ -21,4 +21,6 @@ An integration is a bundle of pre-canned assets which are bundled togather in a
 AWS VPC flow logs integration includes dashboards, visualisations, queries and an index mapping.
 
 ### Dashboards
+The Dashboard uses the index alias `logs-vpc` for shortening the index name - be advised.
+
 ![](../static/dashboard1.png)
diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/aws_s3-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/aws_s3-1.0.0.mapping.json
new file mode 100644
index 000000000..60e519f36
--- /dev/null
+++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/aws_s3-1.0.0.mapping.json
@@ -0,0 +1,171 @@
+{
+  "template": {
+    "mappings": {
+      "_meta": {
+        "version": "1.0.0",
+        "catalog": "observability",
+        "type": "logs",
+        "component": "aws_s3"
+      },
+      "properties": {
+        "aws": {
+          "type" : "object",
+          "properties": {
+            "s3": {
+              "type" : "object",
+              "properties": {
+                "bucket_owner": {
+                  "type": "keyword"
+                },
+                "bucket": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword",
+                      "ignore_above": 256
+                    }
+                  }
+                },
+                "remote_ip": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword",
+                      "ignore_above": 256
+                    }
+                  }
+                },
+                "requester": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword",
+                      "ignore_above": 256
+                    }
+                  }
+                },
+                "request_id": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword",
+                      "ignore_above": 256
+                    }
+                  }
+                },
+                "operation": {
+                  "type": "keyword"
+                },
+                "key": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword",
+                      "ignore_above": 256
+                    }
+                  }
+                },
+                "copy_source": {
+                  "type": "keyword"
+                },
+                "upload_id": {
+                  "type": "keyword"
+                },
+                "delete": {
+                  "type": "keyword"
+                },
+                "part_number": {
+                  "type": "keyword"
+                },
+                "request_uri": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword",
+                      "ignore_above": 256
+                    }
+                  }
+                },
+                "http_status": {
+                  "type": "keyword"
+                },
+                "error_code": {
+                  "type": "keyword"
+                },
+                "bytes_sent": {
+                  "type": "long"
+                },
+                "object_size": {
+                  "type": "long"
+                },
+                "total_time": {
+                  "type": "integer"
+                },
+                "turn_around_time": {
+                  "type": "integer"
+                },
+                "referrer": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword",
+                      "ignore_above": 256
+                    }
+                  }
+                },
+                "user_agent": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword",
+                      "ignore_above": 256
+                    }
+                  }
+                },
+                "version_id": {
+                  "type": "keyword"
+                },
+                "host_id": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword",
+                      "ignore_above": 256
+                    }
+                  }
+                },
+                "signature_version": {
+                  "type": "keyword"
+                },
+                "cipher_suite": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword",
+                      "ignore_above": 256
+                    }
+                  }
+                },
+                "authentication_type": {
+                  "type": "keyword"
+                },
+                "host_header": {
+                  "type": "text",
+                  "fields": {
+                    "keyword": {
+                      "type": "keyword",
+                      "ignore_above": 256
+                    }
+                  }
+                },
+                "tls_version": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/logs_vpc-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/logs_vpc-1.0.0.mapping.json
index 1ef1f7b00..618fd2773 100644
--- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/logs_vpc-1.0.0.mapping.json
+++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/logs_vpc-1.0.0.mapping.json
@@ -1,10 +1,13 @@
 {
   "index_patterns": [
-    "ss4o_logs-*-*"
+    "ss4o_logs-aws_vpc-*"
   ],
   "priority": 900,
   "data_stream": {},
   "template": {
+    "aliases": {
+      "logs-vpc": {}
+    },
     "mappings": {
       "_meta": {
         "version": "1.0.0",
@@ -221,9 +224,9 @@
   },
   "composed_of": [
     "aws_vpc_flow",
+    "aws_s3",
     "cloud",
-    "communication",
-    "s3"
+    "communication"
   ],
   "version": 1,
   "_meta": {
diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/s3-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/s3-1.0.0.mapping.json
deleted file mode 100644
index e520de430..000000000
--- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/s3-1.0.0.mapping.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "template": {
-    "mappings": {
-      "_meta": {
-        "version": "1.0.0",
-        "catalog": "observability",
-        "type": "logs",
-        "component": "s3"
-      },
-      "properties": {
-        "aws": {
-          "properties": {
-            "s3": {
-              "properties": {
-                "bucket": {
-                  "type": "keyword"
-                },
-                "key": {
-                  "type": "keyword"
-                },
-                "copy_source": {
-                  "type": "keyword"
-                },
-                "upload_id": {
-                  "type": "keyword"
-                },
-                "delete": {
-                  "type": "keyword"
-                },
-                "part_number": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}