diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 2272f08..b9e1052 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -18,8 +18,22 @@ jobs:
       REPORTING_INIT_SERVICE_NAME: reporting-init-shell-tools
     steps:
       - uses: actions/checkout@v3
+      - id: files
+        uses: jitterbit/get-changed-files@v1
       - name: Docker build OS Kafka Connector
         run: |
+          OS_KAFKA_CONNECTOR_DOCKER_BUILD="false"
+          for changed_file in ${{ steps.files.outputs.all }}; do
+            if [[ ${changed_file} =~ ^[opensearch-kafka-connector] ]]; then
+              OS_KAFKA_CONNECTOR_DOCKER_BUILD="true"
+              break
+            fi
+          done
+          if [ "$OS_KAFKA_CONNECTOR_DOCKER_BUILD" = "true" ]; then
+            echo "Nothing to build!"
+            exit 0;
+          fi
+
           BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')
           OS_KAFKA_CONNECTOR_IMAGE_ID=$NAMESPACE/$OS_KAFKA_CONNECTOR_SERVICE_NAME
 
@@ -49,6 +63,18 @@ jobs:
           docker push ${{ env.OS_KAFKA_CONNECTOR_IMAGE_ID }}:${{ env.OS_KAFKA_CONNECTOR_VERSION }}
       - name: Docker build Reporting Init
         run: |
+          REPORTING_INIT_DOCKER_BUILD="false"
+          for changed_file in ${{ steps.files.outputs.all }}; do
+            if [[ ${changed_file} =~ ^[reporting-init-docker] ]]; then
+              REPORTING_INIT_DOCKER_BUILD="true"
+              break
+            fi
+          done
+          if [ "$REPORTING_INIT_DOCKER_BUILD" != "true" ]; then
+            echo "Nothing to build!"
+            exit 0;
+          fi
+
           BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')
           REPORTING_INIT_IMAGE_ID=$NAMESPACE/$REPORTING_INIT_SERVICE_NAME
 
diff --git a/charts/debezium/values.yaml b/charts/debezium/values.yaml
index 8cd4d62..29e0499 100644
--- a/charts/debezium/values.yaml
+++ b/charts/debezium/values.yaml
@@ -327,7 +327,6 @@ extraVolumes: []
 ##
 extraVolumeMounts: []
 
-
 kafkaBootstrapServers: '{{ .Release.Name }}-kafka:9092'
 
 ## For full list of available environment variables,
diff --git a/charts/opensearch-kafka-connector/values.yaml b/charts/opensearch-kafka-connector/values.yaml
index 8c4c3d8..3ccd24b 100644
--- a/charts/opensearch-kafka-connector/values.yaml
+++ b/charts/opensearch-kafka-connector/values.yaml
@@ -327,7 +327,6 @@ extraVolumes: []
 ##
 extraVolumeMounts: []
 
-
 kafkaBootstrapServers: '{{ .Release.Name }}-kafka:9092'
 
 ## For full list of available environment variables,
diff --git a/charts/reporting-init/values.yaml b/charts/reporting-init/values.yaml
index 696efd5..b4c25a9 100644
--- a/charts/reporting-init/values.yaml
+++ b/charts/reporting-init/values.yaml
@@ -117,7 +117,9 @@ extraVolumes: []
 extraVolumeMounts: []
 
 debeziumConnectorConfigMap: ""
+
 opensearchConnectorConfigMap: ""
+
 dashboardsConnectorConfigMap: ""
 
 gitConfig:
diff --git a/charts/reporting/.gitignore b/charts/reporting/.gitignore
index f791801..9169e44 100644
--- a/charts/reporting/.gitignore
+++ b/charts/reporting/.gitignore
@@ -1,2 +1,2 @@
-charts/
+charts/*.tgz
 Chart.lock
diff --git a/charts/reporting/charts/debezium b/charts/reporting/charts/debezium
new file mode 120000
index 0000000..e1f2bf5
--- /dev/null
+++ b/charts/reporting/charts/debezium
@@ -0,0 +1 @@
+../../debezium
\ No newline at end of file
diff --git a/charts/reporting/charts/opensearch-kafka-connector b/charts/reporting/charts/opensearch-kafka-connector
new file mode 120000
index 0000000..2e6f8dd
--- /dev/null
+++ b/charts/reporting/charts/opensearch-kafka-connector
@@ -0,0 +1 @@
+../../opensearch-kafka-connector
\ No newline at end of file