diff --git a/packages/configuration-screen/src/ConfigurationScreen.tsx b/packages/configuration-screen/src/ConfigurationScreen.tsx
index 3278ee2..eb52b24 100644
--- a/packages/configuration-screen/src/ConfigurationScreen.tsx
+++ b/packages/configuration-screen/src/ConfigurationScreen.tsx
@@ -1,7 +1,11 @@
 import React, { useEffect, useState, FC } from 'react';
 import {
+    appName,
+    createFlareIndex,
     redirectToHomepage,
     retrieveApiKey,
+    retrieveAvailableIndexNames,
+    retrieveCurrentIndexName,
     retrieveIngestMetadataOnly,
     retrieveTenantId,
     retrieveUserTenants,
@@ -25,11 +29,13 @@ const TOAST_TENANT_SUCCESS = 'tenant_success';
 const ConfigurationScreen: FC<{ theme: string }> = ({ theme }) => {
     const [apiKey, setApiKey] = useState('');
     const [tenantId, setTenantId] = useState(-1);
+    const [indexName, setIndexName] = useState(appName);
     const [errorMessage, setErrorMessage] = useState('');
     const [tenants, setUserTenants] = useState<Tenant[]>([]);
     const [isIngestingMetadataOnly, setIsIngestingMetadataOnly] = useState(false);
     const [isLoading, setIsLoading] = useState(false);
     const [isCompleted, setIsCompleted] = useState(false);
+    const [indexNames, setIndexNames] = useState<string[]>([]);
 
     toastManager.setTheme(theme);
 
@@ -54,6 +60,7 @@ const ConfigurationScreen: FC<{ theme: string }> = ({ theme }) => {
 
     const handleApiKeyChange = (e): void => setApiKey(e.target.value);
     const handleTenantIdChange = (e): void => setTenantId(parseInt(e.target.value, 10));
+    const handleIndexNameChange = (e): void => setIndexName(e.target.value);
     const handleIsIngestingMetadataChange = (e): void => {
         setIsIngestingMetadataOnly(e.target.checked);
     };
@@ -95,7 +102,7 @@ const ConfigurationScreen: FC<{ theme: string }> = ({ theme }) => {
 
     const handleSubmitTenant = (): void => {
         setIsLoading(true);
-        saveConfiguration(apiKey, tenantId, isIngestingMetadataOnly)
+        saveConfiguration(apiKey, tenantId, indexName, isIngestingMetadataOnly)
             .then(() => {
                 setIsLoading(false);
                 setIsCompleted(true);
@@ -128,13 +135,21 @@ const ConfigurationScreen: FC<{ theme: string }> = ({ theme }) => {
         if (isCompleted) {
             return;
         }
-        Promise.all([retrieveApiKey(), retrieveTenantId(), retrieveIngestMetadataOnly()]).then(
-            ([key, id, ingestMetadataOnly]) => {
+        createFlareIndex().then(() => {
+            Promise.all([
+                retrieveApiKey(),
+                retrieveTenantId(),
+                retrieveIngestMetadataOnly(),
+                retrieveCurrentIndexName(),
+                retrieveAvailableIndexNames(),
+            ]).then(([key, id, ingestMetadataOnly, index, availableIndexNames]) => {
                 setApiKey(key);
                 setTenantId(id);
                 setIsIngestingMetadataOnly(ingestMetadataOnly);
-            }
-        );
+                setIndexName(index);
+                setIndexNames(availableIndexNames);
+            });
+        });
     }, [isCompleted]);
 
     useEffect(() => {
@@ -178,11 +193,14 @@ const ConfigurationScreen: FC<{ theme: string }> = ({ theme }) => {
                         show={currentConfigurationStep === ConfigurationSteps.UserPreferences}
                         selectedTenantId={tenantId}
                         tenants={tenants}
+                        selectedIndexName={indexName}
+                        indexNames={indexNames}
                         isLoading={isLoading}
                         isIngestingMetadataOnly={isIngestingMetadataOnly}
                         onNavigateBackClick={handleBackButton}
                         onSubmitUserPreferencesClick={handleSubmitTenant}
                         onTenantIdChange={handleTenantIdChange}
+                        onIndexNameChange={handleIndexNameChange}
                         onIngestingMetadataChange={handleIsIngestingMetadataChange}
                     />
                     <ConfigurationCompletedStep
diff --git a/packages/configuration-screen/src/components/ConfigurationCompletedStep.tsx b/packages/configuration-screen/src/components/ConfigurationCompletedStep.tsx
index af4c8c2..78a2edf 100644
--- a/packages/configuration-screen/src/components/ConfigurationCompletedStep.tsx
+++ b/packages/configuration-screen/src/components/ConfigurationCompletedStep.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useEffect, useState } from 'react';
+import React, { FC } from 'react';
 import Button from './Button';
 import { getFlareDataUrl } from '../utils/setupConfiguration';
 import ArrowRightIcon from './icons/ArrowRightIcon';
@@ -10,12 +10,6 @@ const ConfigurationCompletedStep: FC<{
     tenantName: string;
     onEditConfigurationClick: () => void;
 }> = ({ show, tenantName, onEditConfigurationClick }) => {
-    const [indexName, setIndexName] = useState<string>();
-
-    useEffect(() => {
-        getFlareDataUrl().then((name) => setIndexName(name));
-    }, []);
-
     return (
         <div hidden={!show}>
             <h5>
@@ -29,7 +23,7 @@ const ConfigurationCompletedStep: FC<{
                         Edit Configuration
                     </Button>
                     <div className="link">
-                        <a href={indexName}>View Flare Data</a>
+                        <a href={getFlareDataUrl()}>View Flare Data</a>
                         <ArrowRightIcon remSize={1} />
                     </div>
                 </div>
diff --git a/packages/configuration-screen/src/components/ConfigurationGlobalStep.css b/packages/configuration-screen/src/components/ConfigurationGlobalStep.css
index adacccd..94c04e6 100644
--- a/packages/configuration-screen/src/components/ConfigurationGlobalStep.css
+++ b/packages/configuration-screen/src/components/ConfigurationGlobalStep.css
@@ -3,7 +3,7 @@
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
-    margin-top: 2.5rem;
+    margin-top: 1.5rem;
     gap: 1rem;
 }
 
@@ -13,6 +13,13 @@
     width: 100%;
     align-items: flex-start;
     margin-top: 1rem;
+    gap: 1rem;
+}
+
+.form-item {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
 }
 
 .progress-bar-container {
diff --git a/packages/configuration-screen/src/components/ConfigurationInitialStep.tsx b/packages/configuration-screen/src/components/ConfigurationInitialStep.tsx
index a0a3d2d..a1256f7 100644
--- a/packages/configuration-screen/src/components/ConfigurationInitialStep.tsx
+++ b/packages/configuration-screen/src/components/ConfigurationInitialStep.tsx
@@ -28,28 +28,30 @@ const ConfigurationInitialStep: FC<{
         <div hidden={!show}>
             <h5>Enter your API key</h5>
             <div className="form-group">
-                <div className="label-tooltip">
-                    <Label isRequired>API Key</Label>
-                    <Tooltip>
-                        <div>
-                            {'You can find your API Keys in your '}
-                            <a target="_blank" href="https://app.flare.io/#/profile">
-                                Flare Profile
-                            </a>
-                        </div>
-                    </Tooltip>
-                </div>
-                <input
-                    id="apiKey"
-                    type="password"
-                    value={apiKey}
-                    onChange={onApiKeyChange}
-                    className={`input ${errorMessage.length > 0 ? 'border-error' : ''}`}
-                    placeholder="Your API Key"
-                />
-                <div className="error-container" hidden={errorMessage.length === 0}>
-                    <ErrorIcon remSize={1} />
-                    <small>Error. {errorMessage}</small>
+                <div className="form-item">
+                    <div className="label-tooltip">
+                        <Label isRequired>API Key</Label>
+                        <Tooltip>
+                            <div>
+                                {'You can find your API Keys in your '}
+                                <a target="_blank" href="https://app.flare.io/#/profile">
+                                    Flare Profile
+                                </a>
+                            </div>
+                        </Tooltip>
+                    </div>
+                    <input
+                        id="apiKey"
+                        type="password"
+                        value={apiKey}
+                        onChange={onApiKeyChange}
+                        className={`input ${errorMessage.length > 0 ? 'border-error' : ''}`}
+                        placeholder="Your API Key"
+                    />
+                    <div className="error-container" hidden={errorMessage.length === 0}>
+                        <ErrorIcon remSize={1} />
+                        <small>Error. {errorMessage}</small>
+                    </div>
                 </div>
                 <div className="button-group">
                     <Button onClick={(): void => onCancelConfigurationClick()} isSecondary>
diff --git a/packages/configuration-screen/src/components/ConfigurationUserPreferencesStep.css b/packages/configuration-screen/src/components/ConfigurationUserPreferencesStep.css
index 53c75b4..c367223 100644
--- a/packages/configuration-screen/src/components/ConfigurationUserPreferencesStep.css
+++ b/packages/configuration-screen/src/components/ConfigurationUserPreferencesStep.css
@@ -2,6 +2,7 @@
     font-size: 0.75rem;
     color: var(--secondary-text-color);
     margin-top: 5px;
+    margin-bottom: 1rem;
 }
 
 .switch-layout {
diff --git a/packages/configuration-screen/src/components/ConfigurationUserPreferencesStep.tsx b/packages/configuration-screen/src/components/ConfigurationUserPreferencesStep.tsx
index 01f6a7a..92eaf9c 100644
--- a/packages/configuration-screen/src/components/ConfigurationUserPreferencesStep.tsx
+++ b/packages/configuration-screen/src/components/ConfigurationUserPreferencesStep.tsx
@@ -12,41 +12,66 @@ const ConfigurationUserPreferencesStep: FC<{
     show: boolean;
     tenants: Tenant[];
     selectedTenantId: number;
+    indexNames: string[];
+    selectedIndexName: string;
     isLoading: boolean;
     isIngestingMetadataOnly: boolean;
     onNavigateBackClick: () => void;
     onSubmitUserPreferencesClick: () => void;
     onTenantIdChange: (e: ChangeEvent) => void;
+    onIndexNameChange: (e: ChangeEvent) => void;
     onIngestingMetadataChange: (e: ChangeEvent) => void;
 }> = ({
     show,
     tenants,
     selectedTenantId,
+    indexNames,
+    selectedIndexName,
     isLoading,
     isIngestingMetadataOnly,
     onNavigateBackClick,
     onSubmitUserPreferencesClick,
     onTenantIdChange,
+    onIndexNameChange,
     onIngestingMetadataChange,
 }) => {
     return (
         <div hidden={!show}>
             <h5>Please select the Tenant you want to ingest events from</h5>
             <div className="form-group">
-                <Label isRequired>Tenant</Label>
-                <Select id="tenants" onChange={onTenantIdChange} value={selectedTenantId}>
-                    {tenants.map((tenant) => {
-                        return (
-                            <option key={tenants.indexOf(tenant)} value={tenant.id}>
-                                {tenant.name}
-                            </option>
-                        );
-                    })}
-                </Select>
-                <small className="note">You can only monitor one tenant at a time.</small>
-                <div className="switch-layout">
-                    <span>Only ingest the metadata of events</span>
-                    <Switch value={isIngestingMetadataOnly} onChange={onIngestingMetadataChange} />
+                <div className="form-item">
+                    <Label>Tenant</Label>
+                    <Select id="tenants" onChange={onTenantIdChange} value={selectedTenantId}>
+                        {tenants.map((tenant) => {
+                            return (
+                                <option key={tenants.indexOf(tenant)} value={tenant.id}>
+                                    {tenant.name}
+                                </option>
+                            );
+                        })}
+                    </Select>
+                    <small className="note">You can only monitor one tenant at a time.</small>
+                </div>
+                <div className="form-item">
+                    <Label>Splunk Index for event ingestion</Label>
+                    <Select id="indexes" onChange={onIndexNameChange} value={selectedIndexName}>
+                        {indexNames.map((indexName) => {
+                            return (
+                                <option key={indexNames.indexOf(indexName)} value={indexName}>
+                                    {indexName}
+                                </option>
+                            );
+                        })}
+                    </Select>
+                </div>
+                <div className="form-item">
+                    <div className="switch-layout">
+                        <span>Only ingest the metadata of events</span>
+                        <Switch
+                            value={isIngestingMetadataOnly}
+                            onChange={onIngestingMetadataChange}
+                        />
+                    </div>
                 </div>
                 <div className="button-group">
                     <Button onClick={(): void => onNavigateBackClick()} isSecondary>
diff --git a/packages/configuration-screen/src/components/Select.css b/packages/configuration-screen/src/components/Select.css
index 70bde77..d8de147 100644
--- a/packages/configuration-screen/src/components/Select.css
+++ b/packages/configuration-screen/src/components/Select.css
@@ -8,7 +8,7 @@ select {
     border: 1px solid var(--secondary-text-color);
     border-radius: 40px;
     padding-right: 1rem;
-    margin-top: 1rem;
+    margin-top: 0.5rem;
 }
 
 .select-container:hover {
diff --git a/packages/configuration-screen/src/global.css b/packages/configuration-screen/src/global.css
index f5c566d..14f8ad9 100644
--- a/packages/configuration-screen/src/global.css
+++ b/packages/configuration-screen/src/global.css
@@ -76,7 +76,7 @@ input {
 input {
     border: 1px solid var(--secondary-text-color);
     border-radius: 40px;
-    margin-top: 1rem;
+    margin-top: 0.5rem;
 }
 
 input:hover {
diff --git a/packages/configuration-screen/src/models/splunk.ts b/packages/configuration-screen/src/models/splunk.ts
index 540afa2..a3f25b3 100644
--- a/packages/configuration-screen/src/models/splunk.ts
+++ b/packages/configuration-screen/src/models/splunk.ts
@@ -1,5 +1,3 @@
-import '../vendor/splunk.min.js';
-
 export interface SplunkApplicationNamespace {
     app?: string;
     owner?: string;
@@ -13,6 +11,10 @@ export interface SplunkPassword {
     };
 }
 
+export interface SplunkIndex {
+    name: string;
+}
+
 export interface SplunkAppAccessor {
     reload: () => void;
 }
@@ -51,6 +53,13 @@ export interface ConfigurationsAccessor {
     list: () => Array<{ name: string }>;
 }
 
+export interface SplunkIndexesAccessor {
+    fetch: () => SplunkIndexesAccessor;
+    create: (indexName: string, data: any) => void;
+    item: (indexName: string) => SplunkIndex;
+    list: () => Array<SplunkIndex>;
+}
+
 export interface SplunkStoragePasswordAccessors {
     fetch: () => SplunkStoragePasswordAccessors;
     item: (applicationName: string) => SplunkAppAccessor;
@@ -63,6 +72,7 @@ export interface SplunkService {
     configurations: (params: SplunkApplicationNamespace) => ConfigurationsAccessor;
     apps: () => SplunkAppsAccessor;
     storagePasswords: () => SplunkStoragePasswordAccessors;
+    indexes: () => SplunkIndexesAccessor;
     post: (
         splunkUrlPath: string,
         data: any,
diff --git a/packages/configuration-screen/src/utils/configurationFileHelper.ts b/packages/configuration-screen/src/utils/configurationFileHelper.ts
index e54ecab..4553247 100644
--- a/packages/configuration-screen/src/utils/configurationFileHelper.ts
+++ b/packages/configuration-screen/src/utils/configurationFileHelper.ts
@@ -139,7 +139,13 @@ export async function updateConfigurationFile(
     await updateStanzaProperties(configurationStanzaAccessor, properties);
 }
 
-export async function getCurrentIndexName(service: SplunkService): Promise<string> {
+export async function getConfigurationStanzaValue(
+    service: SplunkService,
+    configurationFilename: string,
+    stanzaName: string,
+    propertyName: string,
+    defaultValue: string
+): Promise<string> {
     // Retrieve the accessor used to get a configuration file
     let configurations = service.configurations({
         // Name space information not provided
@@ -147,22 +153,20 @@ export async function getCurrentIndexName(service: SplunkService): Promise<strin
     configurations = await promisify(configurations.fetch)();
 
     // Retrieves the configuration file accessor
-    let configurationFileAccessor = getConfigurationFile(configurations, 'inputs');
+    let configurationFileAccessor = getConfigurationFile(configurations, configurationFilename);
     configurationFileAccessor = await promisify(configurationFileAccessor.fetch)();
 
     // Retrieves the configuration stanza accessor
     let configurationStanzaAccessor = getConfigurationFileStanza(
         configurationFileAccessor,
-        'script://$SPLUNK_HOME/etc/apps/flare/bin/cron_job_ingest_events.py'
+        stanzaName
     );
     configurationStanzaAccessor = await promisify(configurationStanzaAccessor.fetch)();
 
-    if (
-        !('index' in configurationStanzaAccessor._properties) ||
-        configurationStanzaAccessor._properties.index === 'default'
-    ) {
-        return 'main';
+    let propertyValue = defaultValue;
+    if (propertyName in configurationStanzaAccessor._properties) {
+        propertyValue = configurationStanzaAccessor._properties[propertyName];
     }
 
-    return configurationStanzaAccessor._properties.index;
+    return propertyValue;
 }
diff --git a/packages/configuration-screen/src/utils/setupConfiguration.ts b/packages/configuration-screen/src/utils/setupConfiguration.ts
index 806c911..77ceea8 100644
--- a/packages/configuration-screen/src/utils/setupConfiguration.ts
+++ b/packages/configuration-screen/src/utils/setupConfiguration.ts
@@ -1,4 +1,4 @@
-import { updateConfigurationFile, getCurrentIndexName } from './configurationFileHelper';
+import { updateConfigurationFile, getConfigurationStanzaValue } from './configurationFileHelper';
 import { Tenant } from '../models/flare';
 import {
     PasswordKeys,
@@ -8,7 +8,7 @@ import {
 } from '../models/splunk';
 import { promisify } from './util';
 
-const appName: string = 'flare';
+export const appName: string = 'flare';
 const storageRealm: string = 'flare_integration_realm';
 const applicationNameSpace: SplunkApplicationNamespace = {
     owner: 'nobody',
@@ -17,18 +17,9 @@ const applicationNameSpace: SplunkApplicationNamespace = {
 };
 
 async function completeSetup(splunkService: SplunkService): Promise<void> {
-    const configurationFileName = 'app';
-    const stanzaName = 'install';
-    const propertiesToUpdate = {
+    await updateConfigurationFile(splunkService, 'app', 'install', {
         is_configured: 'true',
-    };
-
-    await updateConfigurationFile(
-        splunkService,
-        configurationFileName,
-        stanzaName,
-        propertiesToUpdate
-    );
+    });
 }
 
 async function reloadApp(splunkService: SplunkService): Promise<void> {
@@ -43,23 +34,20 @@ function getRedirectUrl(): string {
     return `/app/${appName}`;
 }
 
-async function getFlareDataUrl(): Promise<string> {
-    const service = createService(applicationNameSpace);
-    const indexName = await getCurrentIndexName(service);
-
-    return `/app/${appName}/search?q=search%20index%3D"${indexName}"%20source%3D"flare"`;
+function getFlareDataUrl(): string {
+    return `/app/${appName}/search?q=search%20source%3D"flare"`;
 }
 
 function redirectToHomepage(): void {
     window.location.href = getRedirectUrl();
 }
 
-function createService(applicationNamespace: SplunkApplicationNamespace): SplunkService {
+function createService(): SplunkService {
     // The splunkjs is injected by Splunk
     // eslint-disable-next-line no-undef
     const http = new splunkjs.SplunkWebHttp();
     // eslint-disable-next-line no-undef
-    const service = new splunkjs.Service(http, applicationNamespace);
+    const service = new splunkjs.Service(http, applicationNameSpace);
 
     return service;
 }
@@ -69,7 +57,7 @@ function retrieveUserTenants(
     successCallback: (userTenants: Array<Tenant>) => void,
     errorCallback: (errorMessage: string) => void
 ): void {
-    const service = createService(applicationNameSpace);
+    const service = createService();
     const data = { apiKey };
     service.post('/services/retrieve_user_tenants', data, (err, response) => {
         if (err) {
@@ -111,9 +99,10 @@ async function savePassword(
 async function saveConfiguration(
     apiKey: string,
     tenantId: number,
+    indexName: string,
     isIngestingMetadataOnly: boolean
 ): Promise<void> {
-    const service = createService(applicationNameSpace);
+    const service = createService();
 
     const storagePasswords = await promisify(service.storagePasswords().fetch)();
     await savePassword(storagePasswords, PasswordKeys.API_KEY, apiKey);
@@ -123,13 +112,13 @@ async function saveConfiguration(
         PasswordKeys.INGEST_METADATA_ONLY,
         `${isIngestingMetadataOnly}`
     );
-
+    await saveIndexForIngestion(service, indexName);
     await completeSetup(service);
     await reloadApp(service);
 }
 
 async function retrievePassword(passwordKey: string): Promise<string> {
-    const service = createService(applicationNameSpace);
+    const service = createService();
     const storagePasswords = await promisify(service.storagePasswords().fetch)();
     const passwordId = `${storageRealm}:${passwordKey}:`;
 
@@ -165,6 +154,59 @@ async function retrieveIngestMetadataOnly(): Promise<boolean> {
     });
 }
 
+async function createFlareIndex(): Promise<void> {
+    const service = createService();
+    const isConfigured =
+        (await getConfigurationStanzaValue(
+            service,
+            'app',
+            'install',
+            'is_configured',
+            'unknown'
+        )) === '1';
+    if (!isConfigured) {
+        const currentIndexNames = await retrieveAvailableIndexNames();
+        if (!currentIndexNames.find((indexName) => indexName === appName)) {
+            await service.indexes().create(appName, {});
+        }
+    }
+}
+
+async function saveIndexForIngestion(service: SplunkService, indexName: string): Promise<void> {
+    await updateConfigurationFile(
+        service,
+        'inputs',
+        'script://$SPLUNK_HOME/etc/apps/flare/bin/cron_job_ingest_events.py',
+        {
+            index: indexName,
+        }
+    );
+}
+
+async function retrieveAvailableIndexNames(): Promise<Array<string>> {
+    const service = createService();
+    const indexes = await promisify(service.indexes().fetch)();
+    const indexNames: string[] = [];
+    const ignoredIndexNames = ['history', 'summary', 'splunklogger'];
+    for (const { name: indexName } of indexes.list()) {
+        if (!indexName.startsWith('_') && !ignoredIndexNames.includes(indexName)) {
+            indexNames.push(indexName);
+        }
+    }
+    return indexNames;
+}
+
+async function retrieveCurrentIndexName(): Promise<string> {
+    const service = createService();
+    return getConfigurationStanzaValue(
+        service,
+        'inputs',
+        'script://$SPLUNK_HOME/etc/apps/flare/bin/cron_job_ingest_events.py',
+        'index',
+        'main'
+    );
+}
+
 export {
     saveConfiguration,
     retrieveUserTenants,
@@ -174,4 +216,7 @@ export {
     redirectToHomepage,
     getRedirectUrl,
     getFlareDataUrl,
+    createFlareIndex,
+    retrieveAvailableIndexNames,
+    retrieveCurrentIndexName,
 };
diff --git a/packages/flare/bin/cron_job_ingest_events.py b/packages/flare/bin/cron_job_ingest_events.py
index 4beb6fd..674ff7a 100644
--- a/packages/flare/bin/cron_job_ingest_events.py
+++ b/packages/flare/bin/cron_job_ingest_events.py
@@ -25,7 +25,6 @@
 
 
 def main(logger: Logger, app: client.Application) -> None:
-    create_flare_index(app.service)
     create_collection(app=app)
 
     # To avoid cron jobs from doing the same work at the same time, exit new cron jobs if a cron job is already doing work
@@ -63,11 +62,6 @@ def main(logger: Logger, app: client.Application) -> None:
     logger.info(f"Retrieved {events_retrieved_count} events")
 
 
-def create_flare_index(service: Service) -> None:
-    if APP_NAME not in service.indexes:
-        service.indexes.create(APP_NAME)
-
-
 def get_storage_password_value(
     app: client.Application, password_key: str
 ) -> Optional[str]:
diff --git a/packages/flare/tests/bin/test_ingest_events.py b/packages/flare/tests/bin/test_ingest_events.py
index 09fd313..86c306a 100644
--- a/packages/flare/tests/bin/test_ingest_events.py
+++ b/packages/flare/tests/bin/test_ingest_events.py
@@ -14,11 +14,9 @@
 
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../bin"))
-from constants import APP_NAME
 from constants import CRON_JOB_THRESHOLD_SINCE_LAST_FETCH
 from constants import KV_COLLECTION_NAME
 from constants import CollectionKeys
-from cron_job_ingest_events import create_flare_index
 from cron_job_ingest_events import fetch_feed
 from cron_job_ingest_events import get_api_key
 from cron_job_ingest_events import get_collection_value
@@ -31,19 +29,6 @@
 from cron_job_ingest_events import save_start_date
 
 
-def test_create_flare_index_expect_none() -> None:
-    app = MagicMock()
-    app.service.indexes.__contains__.side_effect = lambda x: x == APP_NAME
-    create_flare_index(app.service)
-    app.service.indexes[APP_NAME].assert_not_called()
-
-
-def test_create_flare_index_expect_create() -> None:
-    app = MagicMock()
-    create_flare_index(app.service)
-    app.service.indexes.create.assert_called_once_with(APP_NAME)
-
-
 def test_get_collection_value_expect_none() -> None:
     app = MagicMock()
     assert get_collection_value(app=app, key="some_key") is None
diff --git a/packages/status-screen/src/StatusScreen.tsx b/packages/status-screen/src/StatusScreen.tsx
index 0c9864d..ae64ea0 100644
--- a/packages/status-screen/src/StatusScreen.tsx
+++ b/packages/status-screen/src/StatusScreen.tsx
@@ -4,6 +4,7 @@ import './StatusScreen.css';
 import { findCollection, getVersionName, retrieveTenantId } from './utils/setupConfiguration';
 import { SplunkCollectionItem } from './models/splunk';
 import Button from './components/Button';
+import { retrieveCurrentIndexName } from '../../configuration-screen/src/utils/setupConfiguration';
 
 const COLLECTION_KEYS_NEXT_PREFIX = 'next_';
 
@@ -12,6 +13,7 @@ enum StatusItemKeys {
     LAST_FETCHED = 'timestamp_last_fetch',
     NEXT_TOKEN = 'next_token',
     CURRENT_TENANT_ID = 'current_tenant_id',
+    INDEX = 'index',
 }
 
 interface StatusItem {
@@ -26,27 +28,35 @@ const StatusScreen: FC<{ theme: string }> = ({ theme }) => {
     const [isShowingAllItems, setShowingAllItems] = useState<boolean>(false);
 
     useEffect(() => {
-        Promise.all([retrieveTenantId(), findCollection(), getVersionName()]).then(
-            ([id, splunkCollectionItems, version]) => {
-                const items: StatusItem[] = [];
+        Promise.all([
+            retrieveTenantId(),
+            findCollection(),
+            getVersionName(),
+            retrieveCurrentIndexName(),
+        ]).then(([id, splunkCollectionItems, version, indexName]) => {
+            const items: StatusItem[] = [];
+            items.push({
+                key: StatusItemKeys.CURRENT_TENANT_ID,
+                name: getItemName(StatusItemKeys.CURRENT_TENANT_ID),
+                value: `${id}`,
+            });
+            items.push({
+                key: StatusItemKeys.INDEX,
+                name: getItemName(StatusItemKeys.INDEX),
+                value: `${indexName}`,
+            });
+            splunkCollectionItems.forEach((item) => {
                 items.push({
-                    key: StatusItemKeys.CURRENT_TENANT_ID,
-                    name: getItemName(StatusItemKeys.CURRENT_TENANT_ID),
-                    value: `${id}`,
+                    key: item.key.startsWith(COLLECTION_KEYS_NEXT_PREFIX)
+                        ? StatusItemKeys.NEXT_TOKEN
+                        : (item.key as StatusItemKeys),
+                    name: getItemName(item.key),
+                    value: formatValue(item),
                 });
-                splunkCollectionItems.forEach((item) => {
-                    items.push({
-                        key: item.key.startsWith(COLLECTION_KEYS_NEXT_PREFIX)
-                            ? StatusItemKeys.NEXT_TOKEN
-                            : (item.key as StatusItemKeys),
-                        name: getItemName(item.key),
-                        value: formatValue(item),
-                    });
-                });
-                setStatusItem(items);
-                setVersionName(version);
-            }
-        );
+            });
+            setStatusItem(items);
+            setVersionName(version);
+        });
     }, []);
 
     useEffect(() => {
@@ -87,6 +97,10 @@ const StatusScreen: FC<{ theme: string }> = ({ theme }) => {
             return 'Current Tenant ID';
         }
 
+        if (key === StatusItemKeys.INDEX) {
+            return 'Splunk Index';
+        }
+
         return 'Unknown Status Item';
     }