diff --git a/.github/workflows/filebeat-docker-image.yml b/.github/workflows/filebeat-docker-image.yml
index d517626..1db37c7 100644
--- a/.github/workflows/filebeat-docker-image.yml
+++ b/.github/workflows/filebeat-docker-image.yml
@@ -2,9 +2,9 @@ name: Filebeat image build
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "docparser" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "docparser" ]
 
 defaults:
   run:
diff --git a/diagnostics/opensearch/filebeat/conf/filebeat-k8s.yml b/diagnostics/opensearch/filebeat/conf/filebeat-k8s.yml
index 5e8da2d..89f9750 100644
--- a/diagnostics/opensearch/filebeat/conf/filebeat-k8s.yml
+++ b/diagnostics/opensearch/filebeat/conf/filebeat-k8s.yml
@@ -39,18 +39,18 @@ processors:
     target: ''
     fields:
       datastream: '${ALIAS:unknown}'         
-setup.template.name: "filebeat-%{[agent.version]}"
-setup.template.pattern: "filebeat-%{[agent.version]}-*"    
+setup.template.name: "filebeat-7.11.2"
+setup.template.pattern: "filebeat-7.11.2-*"    
 output.elasticsearch:
   hosts: '${ELASTIC_HOST}'
   indices:
     - index: "%{[datastream]}"
       when.not.equals:
         datastream: "unknown"  
-    - index: "filebeat-%{[agent.version]}-%{[tenant.name]}-%{[kubernetes.container.name]}-%{+yyyy.MM.dd}"
+    - index: "filebeat-7.11.2-%{[tenant.name]}-%{[kubernetes.container.name]}-%{+yyyy.MM.dd}"
       when.equals:
         serviceLevelIndex: "yes"
-    - index: "filebeat-%{[agent.version]}-%{[tenant.name]}-%{+yyyy.MM.dd}"
+    - index: "filebeat-7.11.2-%{[tenant.name]}-%{+yyyy.MM.dd}"
       when.equals:
         tenantLevelIndex: "yes"
   bulk_max_size: '${BULK_MAX_SIZE:50}'
diff --git a/diagnostics/opensearch/filebeat/conf/filebeat.yml b/diagnostics/opensearch/filebeat/conf/filebeat.yml
index 3daf7b0..2fbc830 100644
--- a/diagnostics/opensearch/filebeat/conf/filebeat.yml
+++ b/diagnostics/opensearch/filebeat/conf/filebeat.yml
@@ -26,18 +26,18 @@ processors:
 - drop_fields:
     fields: docker.container.labels
     ignore_missing: true
-setup.template.name: "filebeat-%{[agent.version]}"
-setup.template.pattern: "filebeat-%{[agent.version]}-*"    
+setup.template.name: "filebeat-7.11.2"
+setup.template.pattern: "filebeat-7.11.2-*"    
 output.elasticsearch:
   hosts: '${ELASTIC_HOST}'
   indices:
     - index: "%{[datastream]}"
       when.not.equals:
         datastream: "unknown"
-    - index: "filebeat-%{[agent.version]}-%{[tenant.name]}-%{[docker.attrs.ROLE_NAME]}-%{+yyyy.MM.dd}"
+    - index: "filebeat-7.11.2-%{[tenant.name]}-%{[docker.attrs.ROLE_NAME]}-%{+yyyy.MM.dd}"
       when.equals:
         serviceLevelIndex: "yes"
-    - index: "filebeat-%{[agent.version]}-%{[tenant.name]}-%{+yyyy.MM.dd}"
+    - index: "filebeat-7.11.2-%{[tenant.name]}-%{+yyyy.MM.dd}"
       when.equals:
         tenantLevelIndex: "yes"
   bulk_max_size: '${BULK_MAX_SIZE:50}'