diff --git a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
index 516b053c9..fcfd3d48f 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
@@ -2,26 +2,7 @@
 
 exports[`Integration Setup Page Renders integration setup page as expected 1`] = `
 <SetupIntegrationPage
-  integration={
-    Object {
-      "assets": Object {
-        "savedObjects": Object {
-          "name": "sample",
-          "version": "1.0.1",
-        },
-      },
-      "components": Array [
-        Object {
-          "name": "logs",
-          "version": "1.0.0",
-        },
-      ],
-      "license": "Apache-2.0",
-      "name": "sample",
-      "type": "logs",
-      "version": "2.0.0",
-    }
-  }
+  integration="sample"
 >
   <EuiPage>
     <div
@@ -55,22 +36,9 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                       }
                       integration={
                         Object {
-                          "assets": Object {
-                            "savedObjects": Object {
-                              "name": "sample",
-                              "version": "1.0.1",
-                            },
-                          },
-                          "components": Array [
-                            Object {
-                              "name": "logs",
-                              "version": "1.0.0",
-                            },
-                          ],
-                          "license": "Apache-2.0",
+                          "assets": Object {},
                           "name": "sample",
-                          "type": "logs",
-                          "version": "2.0.0",
+                          "type": "",
                         }
                       }
                       updateConfig={[Function]}
@@ -232,10 +200,12 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                   options={
                                     Array [
                                       Object {
+                                        "disabled": true,
                                         "text": "S3 Connection",
                                         "value": "s3",
                                       },
                                       Object {
+                                        "disabled": true,
                                         "text": "OpenSearch Index",
                                         "value": "index",
                                       },
@@ -273,12 +243,14 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                             value="index"
                                           >
                                             <option
+                                              disabled={true}
                                               key="0"
                                               value="s3"
                                             >
                                               S3 Connection
                                             </option>
                                             <option
+                                              disabled={true}
                                               key="1"
                                               value="index"
                                             >
@@ -724,24 +696,15 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
             }
             integration={
               Object {
-                "assets": Object {
-                  "savedObjects": Object {
-                    "name": "sample",
-                    "version": "1.0.1",
-                  },
-                },
-                "components": Array [
-                  Object {
-                    "name": "logs",
-                    "version": "1.0.0",
-                  },
-                ],
-                "license": "Apache-2.0",
+                "assets": Object {},
                 "name": "sample",
-                "type": "logs",
-                "version": "2.0.0",
+                "type": "",
               }
             }
+            loading={false}
+            loadingProgress={0}
+            setLoading={[Function]}
+            setProgress={[Function]}
           >
             <EuiBottomBar>
               <EuiPortal>
@@ -1243,10 +1206,12 @@ exports[`Integration Setup Page Renders the form as expected 1`] = `
               options={
                 Array [
                   Object {
+                    "disabled": true,
                     "text": "S3 Connection",
                     "value": "s3",
                   },
                   Object {
+                    "disabled": false,
                     "text": "OpenSearch Index",
                     "value": "index",
                   },
@@ -1284,12 +1249,14 @@ exports[`Integration Setup Page Renders the form as expected 1`] = `
                         value="index"
                       >
                         <option
+                          disabled={true}
                           key="0"
                           value="s3"
                         >
                           S3 Connection
                         </option>
                         <option
+                          disabled={false}
                           key="1"
                           value="index"
                         >
diff --git a/public/components/integrations/components/__tests__/setup_integration.test.tsx b/public/components/integrations/components/__tests__/setup_integration.test.tsx
index 4d0431b5e..7e0a90f2c 100644
--- a/public/components/integrations/components/__tests__/setup_integration.test.tsx
+++ b/public/components/integrations/components/__tests__/setup_integration.test.tsx
@@ -17,7 +17,7 @@ describe('Integration Setup Page', () => {
   configure({ adapter: new Adapter() });
 
   it('Renders integration setup page as expected', async () => {
-    const wrapper = mount(<SetupIntegrationPage integration={TEST_INTEGRATION_CONFIG} />);
+    const wrapper = mount(<SetupIntegrationPage integration={TEST_INTEGRATION_CONFIG.name} />);
 
     await waitFor(() => {
       expect(wrapper).toMatchSnapshot();
diff --git a/public/components/integrations/components/create_integration_helpers.ts b/public/components/integrations/components/create_integration_helpers.ts
index fe822ca64..7e465c26b 100644
--- a/public/components/integrations/components/create_integration_helpers.ts
+++ b/public/components/integrations/components/create_integration_helpers.ts
@@ -12,6 +12,17 @@ type ValidationResult = { ok: true } | { ok: false; errors: string[] };
 export interface IntegrationTemplate {
   name: string;
   type: string;
+  assets: {
+    savedObjects?: {
+      name: string;
+      version: string;
+    };
+    queries?: Array<{
+      name: string;
+      version: string;
+      language: string;
+    }>;
+  };
 }
 
 export const doTypeValidation = (
diff --git a/public/components/integrations/components/setup_integration.tsx b/public/components/integrations/components/setup_integration.tsx
index 9fd710157..96470d45b 100644
--- a/public/components/integrations/components/setup_integration.tsx
+++ b/public/components/integrations/components/setup_integration.tsx
@@ -12,17 +12,21 @@ import {
   EuiFlexItem,
   EuiForm,
   EuiFormRow,
+  EuiLoadingDashboards,
+  EuiModal,
   EuiPage,
   EuiPageBody,
   EuiPageContent,
   EuiPageContentBody,
+  EuiProgress,
   EuiSelect,
   EuiSpacer,
+  EuiText,
   EuiTitle,
 } from '@elastic/eui';
 import React, { useState, useEffect } from 'react';
 import { coreRefs } from '../../../framework/core_refs';
-import { addIntegrationRequest } from './create_integration_helpers';
+import { IntegrationTemplate, addIntegrationRequest } from './create_integration_helpers';
 import { useToast } from '../../../../public/components/common/toast';
 import { CONSOLE_PROXY, INTEGRATIONS_BASE } from '../../../../common/constants/shared';
 import { DATACONNECTIONS_BASE } from '../../../../common/constants/shared';
@@ -36,10 +40,7 @@ export interface IntegrationSetupInputs {
 interface IntegrationConfigProps {
   config: IntegrationSetupInputs;
   updateConfig: (updates: Partial<IntegrationSetupInputs>) => void;
-  integration: {
-    name: string;
-    type: string;
-  };
+  integration: IntegrationTemplate;
 }
 
 // TODO support localization
@@ -118,10 +119,50 @@ const suggestDataSources = async (type: string): Promise<Array<{ label: string }
   }
 };
 
-const findTemplate = async (integrationTemplateId: string) => {
-  const http = coreRefs.http!;
-  const result = await http.get(`${INTEGRATIONS_BASE}/repository/${integrationTemplateId}`);
-  return result;
+const runQuery = async (
+  query: string,
+  trackProgress: (step: number) => void
+): Promise<Result<object>> => {
+  // Used for polling
+  const sleep = (ms: number) => {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+  };
+
+  try {
+    const http = coreRefs.http!;
+    const queryId = (
+      await http.post(CONSOLE_PROXY, {
+        body: JSON.stringify({ query, lang: 'sql' }),
+        query: {
+          path: '_plugins/_async_query',
+          method: 'POST',
+        },
+      })
+    ).queryId;
+    while (true) {
+      const poll = await http.post(CONSOLE_PROXY, {
+        body: '{}',
+        query: {
+          path: '_plugins/_async_query/' + queryId,
+          method: 'GET',
+        },
+      });
+      if (poll.status === 'PENDING') {
+        trackProgress(1);
+      } else if (poll.status === 'RUNNING') {
+        trackProgress(2);
+      } else if (poll.status === 'SUCCESS') {
+        trackProgress(3);
+        return { ok: true, value: poll };
+      } else if (poll.status === 'FAILURE') {
+        return { ok: false, error: new Error('FAILURE status', { cause: poll }) };
+      }
+      await sleep(3000);
+    }
+  } catch (err: any) {
+    console.error(err);
+    return { ok: false, error: err };
+  }
 };
 
 export function SetupIntegrationForm({
@@ -169,7 +210,19 @@ export function SetupIntegrationForm({
       <EuiSpacer />
       <EuiFormRow label="Data Source" helpText="Select a data source to connect to.">
         <EuiSelect
-          options={integrationConnectionSelectorItems}
+          options={integrationConnectionSelectorItems.map((item) => {
+            const copy: { value: string; text: string; disabled?: boolean } = { ...item };
+            switch (item.value) {
+              case 's3':
+                copy.disabled = !Object.hasOwn(integration.assets ?? {}, 'queries');
+                return copy;
+              case 'index':
+                copy.disabled = !Object.hasOwn(integration.assets ?? {}, 'savedObjects');
+                return copy;
+              default:
+                return copy;
+            }
+          })}
           value={config.connectionType}
           onChange={(event) =>
             updateConfig({ connectionType: event.target.value, connectionDataSource: '' })
@@ -198,12 +251,19 @@ export function SetupIntegrationForm({
 export function SetupBottomBar({
   config,
   integration,
+  loading,
+  setLoading,
+  loadingProgress,
+  setProgress,
 }: {
   config: IntegrationSetupInputs;
-  integration: { name: string; type: string };
+  integration: IntegrationTemplate;
+  loading: boolean;
+  setLoading: (loading: boolean) => void;
+  loadingProgress: number;
+  setProgress: (updater: number | ((progress: number) => void)) => void;
 }) {
   const { setToast } = useToast();
-  const [loading, setLoading] = useState(false);
 
   return (
     <EuiBottomBar>
@@ -231,16 +291,55 @@ export function SetupBottomBar({
             isLoading={loading}
             onClick={async () => {
               setLoading(true);
-              const template = await findTemplate(integration.name);
-              await addIntegrationRequest(
-                false,
-                integration.name,
-                config.displayName,
-                template,
-                setToast,
-                config.displayName,
-                config.connectionDataSource
-              );
+
+              if (config.connectionType === 'index') {
+                await addIntegrationRequest(
+                  false,
+                  integration.name,
+                  config.displayName,
+                  integration,
+                  setToast,
+                  config.displayName,
+                  config.connectionDataSource
+                );
+                setProgress((progress) => progress + 1);
+              } else if (config.connectionType === 's3') {
+                const http = coreRefs.http!;
+
+                const assets = await http.get(
+                  `${INTEGRATIONS_BASE}/repository/${integration.name}/assets`
+                );
+                setProgress((progress) => progress + 1);
+
+                // Queries must exist because we disable s3 if they're not present
+                for (const query of assets.data.queries!) {
+                  const queryStr = query.query.replace('${TABLE}', config.connectionDataSource);
+                  const currProgress = loadingProgress; // Need a frozen copy for getting accurate query steps
+                  const result = await runQuery(queryStr, (step) =>
+                    setProgress(currProgress + step)
+                  );
+                  if (!result.ok) {
+                    console.error('Query failed', result.error);
+                    setLoading(false);
+                    setToast('Something went wrong.', 'danger');
+                    return;
+                  }
+                }
+                // Once everything is ready, add the integration to the new datasource as usual
+                // TODO determine actual values here after more about queries is known
+                await addIntegrationRequest(
+                  false,
+                  integration.name,
+                  config.displayName,
+                  integration,
+                  setToast,
+                  config.displayName,
+                  config.connectionDataSource
+                );
+                setProgress((progress) => progress + 1);
+              } else {
+                console.error('Invalid data source type');
+              }
               setLoading(false);
             }}
           >
@@ -252,36 +351,84 @@ export function SetupBottomBar({
   );
 }
 
-export function SetupIntegrationPage({
-  integration,
-}: {
-  integration: {
-    name: string;
-    type: string;
-  };
-}) {
+export function LoadingPage({ value, max }: { value: number; max: number }) {
+  return (
+    <>
+      <EuiSpacer size="xxl" />
+      <EuiFlexGroup direction="column" justifyContent="center" alignItems="center">
+        <EuiFlexItem grow={false}>
+          <EuiLoadingDashboards size="xxl" />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiTitle>
+            <h3>Adding Integration</h3>
+          </EuiTitle>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiText>
+            This may take a few minutes. The integration and assets are being added.
+          </EuiText>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer />
+      <EuiProgress value={value} max={max} size="m" />
+    </>
+  );
+}
+
+export function SetupIntegrationPage({ integration }: { integration: string }) {
   const [integConfig, setConfig] = useState({
-    displayName: `${integration.name} Integration`,
+    displayName: `${integration} Integration`,
     connectionType: 'index',
     connectionDataSource: '',
   } as IntegrationSetupInputs);
 
+  const [template, setTemplate] = useState({
+    name: integration,
+    type: '',
+    assets: {},
+  } as IntegrationTemplate);
+
+  const [showLoading, setShowLoading] = useState(false);
+  const [loadingProgress, setLoadingProgress] = useState(0);
+
+  useEffect(() => {
+    const getTemplate = async () => {
+      const http = coreRefs.http!;
+      const value = await http.get(INTEGRATIONS_BASE + `/repository/${integration}`);
+      setTemplate(value.data);
+    };
+    getTemplate();
+  }, [integration]);
+
   const updateConfig = (updates: Partial<IntegrationSetupInputs>) =>
     setConfig(Object.assign({}, integConfig, updates));
+  const maxProgress = 2 + 3 * (template.assets?.queries?.length ?? 0);
 
   return (
     <EuiPage>
       <EuiPageBody>
         <EuiPageContent>
           <EuiPageContentBody>
-            <SetupIntegrationForm
-              config={integConfig}
-              updateConfig={updateConfig}
-              integration={integration}
-            />
+            {showLoading ? (
+              <LoadingPage value={loadingProgress} max={maxProgress} />
+            ) : (
+              <SetupIntegrationForm
+                config={integConfig}
+                updateConfig={updateConfig}
+                integration={template}
+              />
+            )}
           </EuiPageContentBody>
         </EuiPageContent>
-        <SetupBottomBar config={integConfig} integration={integration} />
+        <SetupBottomBar
+          config={integConfig}
+          integration={template}
+          loading={showLoading}
+          setLoading={setShowLoading}
+          loadingProgress={loadingProgress}
+          setProgress={setLoadingProgress}
+        />
       </EuiPageBody>
     </EuiPage>
   );
diff --git a/public/components/integrations/home.tsx b/public/components/integrations/home.tsx
index 7a6b3db5d..2782b92a8 100644
--- a/public/components/integrations/home.tsx
+++ b/public/components/integrations/home.tsx
@@ -65,12 +65,7 @@ export const Home = (props: HomeProps) => {
             exact
             path={'/available/:id/setup'}
             render={(routerProps) => (
-              <SetupIntegrationPage
-                integration={{
-                  name: routerProps.match.params.id,
-                  type: 'logs', // TODO
-                }}
-              />
+              <SetupIntegrationPage integration={decodeURIComponent(routerProps.match.params.id)} />
             )}
           />
         </Switch>
diff --git a/server/adaptors/integrations/repository/integration.ts b/server/adaptors/integrations/repository/integration.ts
index fca1aef5c..83e5779ac 100644
--- a/server/adaptors/integrations/repository/integration.ts
+++ b/server/adaptors/integrations/repository/integration.ts
@@ -109,6 +109,10 @@ export class IntegrationReader {
   ): Promise<
     Result<{
       savedObjects?: object[];
+      queries?: Array<{
+        query: string;
+        language: string;
+      }>;
     }>
   > {
     const configResult = await this.getConfig(version);
@@ -117,7 +121,10 @@ export class IntegrationReader {
     }
     const config = configResult.value;
 
-    const resultValue: { savedObjects?: object[] } = {};
+    const resultValue: {
+      savedObjects?: object[];
+      queries?: Array<{ query: string; language: string }>;
+    } = {};
     if (config.assets.savedObjects) {
       const sobjPath = `${config.assets.savedObjects.name}-${config.assets.savedObjects.version}.ndjson`;
       const assets = await this.reader.readFile(sobjPath, 'assets');
@@ -126,6 +133,31 @@ export class IntegrationReader {
       }
       resultValue.savedObjects = assets.value as object[];
     }
+    if (config.assets.queries) {
+      resultValue.queries = [];
+      const queries = await Promise.all(
+        config.assets.queries.map(async (item) => {
+          const queryPath = `${item.name}-${item.version}.${item.language}`;
+          const query = await this.reader.readFileRaw(queryPath, 'assets');
+          if (!query.ok) {
+            return query;
+          }
+          return {
+            ok: true as const,
+            value: {
+              language: item.language,
+              query: query.value.toString('utf8'),
+            },
+          };
+        })
+      );
+      for (const query of queries) {
+        if (!query.ok) {
+          return query;
+        }
+        resultValue.queries.push(query.value);
+      }
+    }
     return { ok: true, value: resultValue };
   }
 
diff --git a/server/adaptors/integrations/types.ts b/server/adaptors/integrations/types.ts
index c74829d30..fd5729afc 100644
--- a/server/adaptors/integrations/types.ts
+++ b/server/adaptors/integrations/types.ts
@@ -5,6 +5,18 @@
 
 type Result<T, E = Error> = { ok: true; value: T } | { ok: false; error: E };
 
+interface IntegrationAssets {
+  savedObjects?: {
+    name: string;
+    version: string;
+  };
+  queries?: Array<{
+    name: string;
+    version: string;
+    language: string;
+  }>;
+}
+
 interface IntegrationConfig {
   name: string;
   version: string;
@@ -22,12 +34,7 @@ interface IntegrationConfig {
     darkModeGallery?: StaticAsset[];
   };
   components: IntegrationComponent[];
-  assets: {
-    savedObjects?: {
-      name: string;
-      version: string;
-    };
-  };
+  assets: IntegrationAssets;
   sampleData?: {
     path: string;
   };
diff --git a/server/adaptors/integrations/validators.ts b/server/adaptors/integrations/validators.ts
index 7486a38ed..2a4a717a9 100644
--- a/server/adaptors/integrations/validators.ts
+++ b/server/adaptors/integrations/validators.ts
@@ -64,6 +64,19 @@ const templateSchema: JSONSchemaType<IntegrationConfig> = {
           nullable: true,
           additionalProperties: false,
         },
+        queries: {
+          type: 'array',
+          items: {
+            type: 'object',
+            properties: {
+              name: { type: 'string' },
+              version: { type: 'string' },
+              language: { type: 'string' },
+            },
+            required: ['name', 'version', 'language'],
+          },
+          nullable: true,
+        },
       },
       additionalProperties: false,
     },