diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker
index a5cefbc2397c..76b79e8fca9c 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker
@@ -160,6 +160,7 @@ opensearch_dashboards_vars=(
     data_source.audit.appender.layout.kind
     data_source.audit.appender.layout.highlight
     data_source.audit.appender.layout.pattern
+    pit.enabled
 )
 
 longopts=''
diff --git a/src/plugins/point_in_time_management/opensearch_dashboards.json b/src/plugins/point_in_time_management/opensearch_dashboards.json
index 721df040b8c6..1757278f19a6 100644
--- a/src/plugins/point_in_time_management/opensearch_dashboards.json
+++ b/src/plugins/point_in_time_management/opensearch_dashboards.json
@@ -1,5 +1,5 @@
 {
-  "id": "pointInTimeManagement",
+  "id": "pit",
   "version": "1.0.0",
   "opensearchDashboardsVersion": "opensearchDashboards",
   "server": true,
diff --git a/src/plugins/point_in_time_management/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap b/src/plugins/point_in_time_management/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap
index 85fce0751895..cc1ee347208f 100644
--- a/src/plugins/point_in_time_management/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap
+++ b/src/plugins/point_in_time_management/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap
@@ -26,6 +26,7 @@ exports[`EmptyState should render normally 1`] = `
         </EuiTitle>
       </EuiPageContentHeaderSection>
       <EuiButton
+        data-test-subj="createPITBtnInHeader"
         fill={true}
         iconType="plusInCircle"
       >
@@ -67,7 +68,9 @@ exports[`EmptyState should render normally 1`] = `
           No point in time objects have been created yet.
         </EuiFlexItem>
         <EuiSpacer />
-        <EuiButton>
+        <EuiButton
+          data-test-subj="createPITBtnInBody"
+        >
           <FormattedMessage
             defaultMessage="Create point in time"
             id="pointInTimeManagement.createPointInTimeButton"
diff --git a/src/plugins/point_in_time_management/public/components/empty_state/empty_state.tsx b/src/plugins/point_in_time_management/public/components/empty_state/empty_state.tsx
index e1b0cb9bb761..650c742c6744 100644
--- a/src/plugins/point_in_time_management/public/components/empty_state/empty_state.tsx
+++ b/src/plugins/point_in_time_management/public/components/empty_state/empty_state.tsx
@@ -39,7 +39,7 @@ export const EmptyState = () => {
               </h1>
             </EuiTitle>
           </EuiPageContentHeaderSection>
-          <EuiButton fill={true} iconType="plusInCircle">
+          <EuiButton fill={true} iconType="plusInCircle" data-test-subj="createPITBtnInHeader">
             <FormattedMessage
               id="pointInTimeManagement.header.createPointInTimeButton"
               defaultMessage="Create point in time"
@@ -64,7 +64,7 @@ export const EmptyState = () => {
           >
             <EuiFlexItem grow={false}>No point in time objects have been created yet.</EuiFlexItem>
             <EuiSpacer />
-            <EuiButton>
+            <EuiButton data-test-subj="createPITBtnInBody">
               <FormattedMessage
                 id="pointInTimeManagement.createPointInTimeButton"
                 defaultMessage="Create point in time"