diff --git a/defaults/main.yml b/defaults/main.yml
index 806647b..ba51be1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -56,6 +56,10 @@ trace_agent_image_tag: "latest"
 log_agent_image_tag: "latest"
 postgres_agent_image_tag: "latest"
 plan_postgres_agent_image_tag: "latest"
+mysql_agent_image_tag: "latest"
+plan_mysql_agent_image_tag: "latest"
+maria_agent_image_tag: "latest"
+plan_maria_agent_image_tag: "latest"
 
 container_agent_restart_policy: "always"
 node_agent_restart_policy: "always"
@@ -63,6 +67,10 @@ trace_agent_restart_policy: "always"
 log_agent_restart_policy: "always"
 postgres_agent_restart_policy: "always"
 plan_postgres_agent_restart_policy: "always"
+mysql_agent_restart_policy: "always"
+plan_mysql_agent_restart_policy: "always"
+maria_agent_restart_policy: "always"
+plan_maria_agent_restart_policy: "always"
 
 container_agent_log_level: "INFO"
 node_agent_log_level: "INFO"
diff --git a/tasks/check-agent.yml b/tasks/check-agent.yml
index 63d277d..9286cea 100644
--- a/tasks/check-agent.yml
+++ b/tasks/check-agent.yml
@@ -9,8 +9,7 @@
 
 - name: "Check dsk-log-agent"
   include_tasks: dsk-log-agent.yml
-  when: 
-  - '"dsk-log-agent" in datasaker_agents'
+  when: '"dsk-log-agent" in datasaker_agents'
 
 - name: "Check dsk-postgres-agent"
   include_tasks: dsk-postgres-agent.yml
@@ -20,6 +19,22 @@
   include_tasks: dsk-plan-postgres-agent.yml
   when: '"dsk-plan-postgres-agent" in datasaker_agents'
 
+- name: "Check dsk-mysql-agent"
+  include_tasks: dsk-mysql-agent.yml
+  when: '"dsk-mysql-agent" in datasaker_agents'
+
+- name: "Check dsk-plan-mysql-agent"
+  include_tasks: dsk-plan-mysql-agent.yml
+  when: '"dsk-plan-mysql-agent" in datasaker_agents'
+
+- name: "Check dsk-maria-agent"
+  include_tasks: dsk-maria-agent.yml
+  when: '"dsk-maria-agent" in datasaker_agents'
+
+- name: "Check dsk-plan-maria-agent"
+  include_tasks: dsk-plan-maria-agent.yml
+  when: '"dsk-plan-maria-agent" in datasaker_agents'
+
 - name: "Check dsk-docker-node-agent"
   include_tasks: dsk-docker-node-agent.yml
   when: '"dsk-docker-node-agent" in datasaker_docker_agents'
@@ -46,4 +61,12 @@
 
 - name: "Check dsk-docker-trace-agent"
   include_tasks: dsk-docker-trace-agent.yml
-  when: '"dsk-docker-trace-agent" in datasaker_docker_agents'
\ No newline at end of file
+  when: '"dsk-docker-trace-agent" in datasaker_docker_agents'
+
+- name: "Check dsk-docker-mysql-agent"
+  include_tasks: dsk-docker-mysql-agent.yml
+  when: '"dsk-docker-mysql-agent" in datasaker_docker_agents'
+
+- name: "Check dsk-docker-maria-agent"
+  include_tasks: dsk-docker-maria-agent.yml
+  when: '"dsk-docker-maria-agent" in datasaker_docker_agents'
\ No newline at end of file
diff --git a/tasks/dsk-docker-maria-agent.yml b/tasks/dsk-docker-maria-agent.yml
new file mode 100644
index 0000000..4349d03
--- /dev/null
+++ b/tasks/dsk-docker-maria-agent.yml
@@ -0,0 +1,59 @@
+---
+- name: "Create datasaker local directory"
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: directory
+    owner: "{{datasaker_docker_user}}"
+    group: "{{datasaker_docker_group}}"
+    mode: '0755'
+  with_items:
+    - "{{ datasaker_docker_path }}/agent/dsk-maria-agent"
+    - "{{ datasaker_docker_path }}/agent/dsk-plan-maria-agent"
+
+- name: "Create agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_docker_path }}/dsk-docker-maria-config.yml"
+    state: touch
+
+- name: "Setting dsk-maria-agent config"
+  template:
+    src: docker-maria-agent-config.yml.j2
+    dest: "{{ datasaker_docker_path }}/dsk-docker-maria-config.yml"
+
+- name: "Create agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_docker_path }}/dsk-docker-plan-maria-config.yml"
+    state: touch
+
+- name: "Setting plan-dsk-maria-agent config"
+  template:
+    src: docker-plan-maria-agent-config.yml.j2
+    dest: "{{ datasaker_docker_path }}/dsk-docker-plan-maria-config.yml"
+
+- name: "Run dsk-maria-agent container"
+  docker_container:
+    name: dsk-docker-maria-agent
+    image: "datasaker/dsk-maria-agent:{{ maria_agent_image_tag }}"
+    state: started
+    restart_policy: "{{ maria_agent_restart_policy }}"
+    detach: true
+    env:
+      DKS_LOG_LEVEL: "info"
+    volumes:
+      - "{{ datasaker_docker_path }}:/var/datasaker/"
+      - "{{ datasaker_docker_global_config }}:/etc/datasaker/global-config.yml:ro"
+      - "{{ datasaker_docker_path }}/dsk-docker-maria-config.yml:/etc/datasaker/dsk-maria-agent/agent-config.yml:ro"
+
+- name: "Run dsk-plan-maria-agent container"
+  docker_container:
+    name: dsk-docker-plan-maria-agent
+    image: "datasaker/dsk-plan-maria-agent:{{ plan_maria_agent_image_tag }}"
+    state: started
+    restart_policy: "{{ plan_maria_agent_restart_policy }}"
+    detach: true
+    env:
+      DKS_LOG_LEVEL: "info"
+    volumes:
+      - "{{ datasaker_docker_path }}:/var/datasaker/"
+      - "{{ datasaker_docker_global_config }}:/etc/datasaker/global-config.yml:ro"
+      - "{{ datasaker_docker_path }}/dsk-docker-plan-maria-config.yml:/etc/datasaker/dsk-plan-maria-agent/agent-config.yml:ro"
\ No newline at end of file
diff --git a/tasks/dsk-docker-mysql-agent.yml b/tasks/dsk-docker-mysql-agent.yml
new file mode 100644
index 0000000..450ba9f
--- /dev/null
+++ b/tasks/dsk-docker-mysql-agent.yml
@@ -0,0 +1,59 @@
+---
+- name: "Create datasaker local directory"
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: directory
+    owner: "{{datasaker_docker_user}}"
+    group: "{{datasaker_docker_group}}"
+    mode: '0755'
+  with_items:
+    - "{{ datasaker_docker_path }}/agent/dsk-mysql-agent"
+    - "{{ datasaker_docker_path }}/agent/dsk-plan-mysql-agent"
+
+- name: "Create agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_docker_path }}/dsk-docker-mysql-config.yml"
+    state: touch
+
+- name: "Setting dsk-mysql-agent config"
+  template:
+    src: docker-mysql-agent-config.yml.j2
+    dest: "{{ datasaker_docker_path }}/dsk-docker-mysql-config.yml"
+
+- name: "Create agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_docker_path }}/dsk-docker-plan-mysql-config.yml"
+    state: touch
+
+- name: "Setting plan-dsk-mysql-agent config"
+  template:
+    src: docker-plan-mysql-agent-config.yml.j2
+    dest: "{{ datasaker_docker_path }}/dsk-docker-plan-mysql-config.yml"
+
+- name: "Run dsk-mysql-agent container"
+  docker_container:
+    name: dsk-docker-mysql-agent
+    image: "datasaker/dsk-mysql-agent:{{ mysql_agent_image_tag }}"
+    state: started
+    restart_policy: "{{ mysql_agent_restart_policy }}"
+    detach: true
+    env:
+      DKS_LOG_LEVEL: "info"
+    volumes:
+      - "{{ datasaker_docker_path }}:/var/datasaker/"
+      - "{{ datasaker_docker_global_config }}:/etc/datasaker/global-config.yml:ro"
+      - "{{ datasaker_docker_path }}/dsk-docker-mysql-config.yml:/etc/datasaker/dsk-mysql-agent/agent-config.yml:ro"
+
+- name: "Run dsk-plan-mysql-agent container"
+  docker_container:
+    name: dsk-docker-plan-mysql-agent
+    image: "datasaker/dsk-plan-mysql-agent:{{ plan_mysql_agent_image_tag }}"
+    state: started
+    restart_policy: "{{ plan_mysql_agent_restart_policy }}"
+    detach: true
+    env:
+      DKS_LOG_LEVEL: "info"
+    volumes:
+      - "{{ datasaker_docker_path }}:/var/datasaker/"
+      - "{{ datasaker_docker_global_config }}:/etc/datasaker/global-config.yml:ro"
+      - "{{ datasaker_docker_path }}/dsk-docker-plan-mysql-config.yml:/etc/datasaker/dsk-plan-mysql-agent/agent-config.yml:ro"
\ No newline at end of file
diff --git a/tasks/dsk-maria-agent.yml b/tasks/dsk-maria-agent.yml
new file mode 100644
index 0000000..7477f7d
--- /dev/null
+++ b/tasks/dsk-maria-agent.yml
@@ -0,0 +1,20 @@
+---
+- name: "Make agent Directory"
+  ansible.builtin.file:
+    path: "{{ datasaker_host_path }}/{{ item }}"
+    state: directory
+    recurse: yes
+    owner: root
+    group: root
+  with_items:
+    - "dsk-maria-agent"
+
+- name: "Create agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_host_path }}/dsk-maria-agent/agent-config.yml"
+    state: touch
+
+- name: "Setting dsk-maria-agent config"
+  template:
+    src: maria-agent-config.yml.j2
+    dest: "{{ datasaker_host_path }}/dsk-maria-agent/agent-config.yml"
\ No newline at end of file
diff --git a/tasks/dsk-mysql-agent.yml b/tasks/dsk-mysql-agent.yml
new file mode 100644
index 0000000..a4a9a40
--- /dev/null
+++ b/tasks/dsk-mysql-agent.yml
@@ -0,0 +1,20 @@
+---
+- name: "Make agent Directory"
+  ansible.builtin.file:
+    path: "{{ datasaker_host_path }}/{{ item }}"
+    state: directory
+    recurse: yes
+    owner: root
+    group: root
+  with_items:
+    - "dsk-mysql-agent"
+
+- name: "Create agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_host_path }}/dsk-mysql-agent/agent-config.yml"
+    state: touch
+
+- name: "Setting dsk-mysql-agent config"
+  template:
+    src: mysql-agent-config.yml.j2
+    dest: "{{ datasaker_host_path }}/dsk-mysql-agent/agent-config.yml"
\ No newline at end of file
diff --git a/tasks/dsk-plan-maria-agent.yml b/tasks/dsk-plan-maria-agent.yml
new file mode 100644
index 0000000..808cbb2
--- /dev/null
+++ b/tasks/dsk-plan-maria-agent.yml
@@ -0,0 +1,20 @@
+---
+- name: "Make agent Directory"
+  ansible.builtin.file:
+    path: "{{ datasaker_host_path }}/{{ item }}"
+    state: directory
+    recurse: yes
+    owner: root
+    group: root
+  with_items:
+    - "dsk-plan-maria-agent"
+
+- name: "Create agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_host_path }}/dsk-plan-maria-agent/agent-config.yml"
+    state: touch
+
+- name: "Setting dsk-plan-maria-agent config"
+  template:
+    src: plan-maria-agent-config.yml.j2
+    dest: "{{ datasaker_host_path }}/dsk-plan-maria-agent/agent-config.yml"
\ No newline at end of file
diff --git a/tasks/dsk-plan-mysql-agent.yml b/tasks/dsk-plan-mysql-agent.yml
new file mode 100644
index 0000000..8f3406a
--- /dev/null
+++ b/tasks/dsk-plan-mysql-agent.yml
@@ -0,0 +1,20 @@
+---
+- name: "Make agent Directory"
+  ansible.builtin.file:
+    path: "{{ datasaker_host_path }}/{{ item }}"
+    state: directory
+    recurse: yes
+    owner: root
+    group: root
+  with_items:
+    - "dsk-plan-mysql-agent"
+
+- name: "Create agent config"
+  ansible.builtin.file:
+    path: "{{ datasaker_host_path }}/dsk-plan-mysql-agent/agent-config.yml"
+    state: touch
+
+- name: "Setting dsk-plan-mysql-agent config"
+  template:
+    src: plan-mysql-agent-config.yml.j2
+    dest: "{{ datasaker_host_path }}/dsk-plan-mysql-agent/agent-config.yml"
\ No newline at end of file
diff --git a/tasks/remove-datasaker.yml b/tasks/remove-datasaker.yml
index 7d8d4d7..3e81698 100644
--- a/tasks/remove-datasaker.yml
+++ b/tasks/remove-datasaker.yml
@@ -95,6 +95,22 @@
     - '"dsk-docker-postgres-agent" in datasaker_docker_agents'
   ignore_errors: true
 
+- name: Stop the Docker plan-mysql-agent container
+  docker_container:
+    name: "dsk-docker-plan-mysql-agent"
+    state: absent
+  when:
+    - '"dsk-docker-mysql-agent" in datasaker_docker_agents'
+  ignore_errors: true
+
+- name: Stop the Docker plan-maria-agent container
+  docker_container:
+    name: "dsk-docker-plan-maria-agent"
+    state: absent
+  when:
+    - '"dsk-docker-maria-agent" in datasaker_docker_agents'
+  ignore_errors: true
+
 - name: Remove Datasaker Docker Agent Directory
   ansible.builtin.file:
     path: "{{ datasaker_docker_path }}/{{ item }}"
diff --git a/templates/docker-maria-agent-config.yml.j2 b/templates/docker-maria-agent-config.yml.j2
new file mode 100644
index 0000000..fef2ebf
--- /dev/null
+++ b/templates/docker-maria-agent-config.yml.j2
@@ -0,0 +1,31 @@
+agent:
+  metadata:
+    agent_name: "{{ maria_agent_name | default('dsk-maria-agent') }}"
+    cluster_id: "{{ maria_agent_cluster | default('unknown') }}"
+  option:
+    exporter_config:
+      command: /etc/datasaker/target-exporter
+      port: {{ maria_agent_port | default('9104') }}
+      args:
+      - --data-source-user={{ maria_user_name | default('') }}
+      - --data-source-pass={{ maria_user_password | default('') }}
+      - --data-source-uri={{ maria_database_address | default('') }}:{{ maria_database_port | default('') }}
+      - --data-source-dbname={{ maria_database_name | default('') }}
+    scrape_configs:
+      - job_name: dsk-maria-agent-5s
+        scrape_interval: 5s
+        metrics_path: /metrics/5s
+        url: localhost:{{ maria_agent_port | default('9104') }}
+        filtering_configs:
+          rule: drop
+      - job_name: dsk-maria-agent-15s
+        metrics_path: /metrics/15s
+        url: localhost:{{ maria_agent_port | default('9104') }}
+        filtering_configs:
+          rule: drop
+      - job_name: dsk-maria-agent-60s
+        scrape_interval: 60s
+        metrics_path: /metrics/60s
+        url: localhost:{{ maria_agent_port | default('9104') }}
+        filtering_configs:
+          rule: drop
\ No newline at end of file
diff --git a/templates/docker-mysql-agent-config.yml.j2 b/templates/docker-mysql-agent-config.yml.j2
new file mode 100644
index 0000000..a00365a
--- /dev/null
+++ b/templates/docker-mysql-agent-config.yml.j2
@@ -0,0 +1,31 @@
+agent:
+  metadata:
+    agent_name: "{{ mysql_agent_name | default('dsk-mysql-agent') }}"
+    cluster_id: "{{ mysql_agent_cluster | default('unknown') }}"
+  option:
+    exporter_config:
+      command: /etc/datasaker/target-exporter
+      port: {{ mysql_agent_port | default('9104') }}
+      args:
+      - --data-source-user={{ mysql_user_name | default('') }}
+      - --data-source-pass={{ mysql_user_password | default('') }}
+      - --data-source-uri={{ mysql_database_address | default('') }}:{{ mysql_database_port | default('') }}
+      - --data-source-dbname={{ mysql_database_name | default('') }}
+    scrape_configs:
+      - job_name: dsk-mysql-agent-5s
+        scrape_interval: 5s
+        metrics_path: /metrics/5s
+        url: localhost:{{ mysql_agent_port | default('9104') }}
+        filtering_configs:
+          rule: drop
+      - job_name: dsk-mysql-agent-15s
+        metrics_path: /metrics/15s
+        url: localhost:{{ mysql_agent_port | default('9104') }}
+        filtering_configs:
+          rule: drop
+      - job_name: dsk-mysql-agent-60s
+        scrape_interval: 60s
+        metrics_path: /metrics/60s
+        url: localhost:{{ mysql_agent_port | default('9104') }}
+        filtering_configs:
+          rule: drop
\ No newline at end of file
diff --git a/templates/docker-plan-maria-agent-config.yml.j2 b/templates/docker-plan-maria-agent-config.yml.j2
new file mode 100644
index 0000000..5d831a3
--- /dev/null
+++ b/templates/docker-plan-maria-agent-config.yml.j2
@@ -0,0 +1,14 @@
+agent:
+  metadata:
+    agent_name: "{{ plan_maria_agent_name | default('dsk-plan-maria-agent') }}"
+    cluster_id: "{{ plan_maria_agent_cluster | default('unknown') }}"
+  data_source_name:
+    user: {{ maria_user_name | default('') }}
+    password: {{ maria_user_password | default('') }}
+    address: {{ maria_database_address | default('') }}
+    port: {{ maria_database_port | default('') }}
+    DBName: {{ maria_database_name | default('') }}
+  explain:
+    scrape_interval: {{ scrape_interval | default('5s') }}
+    scrape_timeout: {{ scrape_timeout | default('5s') }}
+    slow_query_standard: {{ slow_query_standard | default('1s') }}
\ No newline at end of file
diff --git a/templates/docker-plan-mysql-agent-config.yml.j2 b/templates/docker-plan-mysql-agent-config.yml.j2
new file mode 100644
index 0000000..327d306
--- /dev/null
+++ b/templates/docker-plan-mysql-agent-config.yml.j2
@@ -0,0 +1,14 @@
+agent:
+  metadata:
+    agent_name: "{{ plan_mysql_agent_name | default('dsk-plan-mysql-agent') }}"
+    cluster_id: "{{ plan_mysql_agent_cluster | default('unknown') }}"
+  data_source_name:
+    user: {{ mysql_user_name | default('') }}
+    password: {{ mysql_user_password | default('') }}
+    address: {{ mysql_database_address | default('') }}
+    port: {{ mysql_database_port | default('') }}
+    DBName: {{ mysql_database_name | default('') }}
+  explain:
+    scrape_interval: {{ scrape_interval | default('5s') }}
+    scrape_timeout: {{ scrape_timeout | default('5s') }}
+    slow_query_standard: {{ slow_query_standard | default('1s') }}
\ No newline at end of file
diff --git a/templates/maria-agent-config.yml.j2 b/templates/maria-agent-config.yml.j2
new file mode 100644
index 0000000..fd20152
--- /dev/null
+++ b/templates/maria-agent-config.yml.j2
@@ -0,0 +1,33 @@
+agent:
+  metadata:
+    agent_name: "{{ maria_agent_name | default('dsk-maria-agent') }}"
+    cluster_id: "{{ maria_agent_cluster | default('unknown') }}"
+  option:
+    exporter_config:
+      command: "/usr/bin/dsk-maria-exporter"
+      port: {{ maria_agent_port | default('19104') }}
+      args:
+      - --data-source-user={{ maria_user_name | default('') }}
+      - --data-source-pass={{ maria_user_password | default('') }}
+      - --data-source-uri={{ maria_database_address | default('') }}:{{ maria_database_port | default('') }}
+      - --data-source-dbname={{ maria_database_name | default('') }}
+    scrape_interval: 15s
+    scrape_timeout: 5s
+    scrape_configs:
+      - job_name: dsk-maria-agent-5s
+        scrape_interval: 5s
+        metrics_path: /metrics/5s
+        url: localhost:{{ maria_agent_port | default('19104') }}
+        filtering_configs:
+          rule: drop
+      - job_name: dsk-maria-agent-15s
+        metrics_path: /metrics/15s
+        url: localhost:{{ maria_agent_port | default('19104') }}
+        filtering_configs:
+          rule: drop
+      - job_name: dsk-maria-agent-60s
+        scrape_interval: 60s
+        metrics_path: /metrics/60s
+        url: localhost:{{ maria_agent_port | default('19104') }}
+        filtering_configs:
+          rule: drop
\ No newline at end of file
diff --git a/templates/mysql-agent-config.yml.j2 b/templates/mysql-agent-config.yml.j2
new file mode 100644
index 0000000..0ed9def
--- /dev/null
+++ b/templates/mysql-agent-config.yml.j2
@@ -0,0 +1,33 @@
+agent:
+  metadata:
+    agent_name: "{{ mysql_agent_name | default('dsk-mysql-agent') }}"
+    cluster_id: "{{ mysql_agent_cluster | default('unknown') }}"
+  option:
+    exporter_config:
+      command: "/usr/bin/dsk-mysql-exporter"
+      port: {{ mysql_agent_port | default('19104') }}
+      args:
+      - --data-source-user={{ mysql_user_name | default('') }}
+      - --data-source-pass={{ mysql_user_password | default('') }}
+      - --data-source-uri={{ mysql_database_address | default('') }}:{{ mysql_database_port | default('') }}
+      - --data-source-dbname={{ mysql_database_name | default('') }}
+    scrape_interval: 15s
+    scrape_timeout: 5s
+    scrape_configs:
+      - job_name: dsk-mysql-agent-5s
+        scrape_interval: 5s
+        metrics_path: /metrics/5s
+        url: localhost:{{ mysql_agent_port | default('19104') }}
+        filtering_configs:
+          rule: drop
+      - job_name: dsk-mysql-agent-15s
+        metrics_path: /metrics/15s
+        url: localhost:{{ mysql_agent_port | default('19104') }}
+        filtering_configs:
+          rule: drop
+      - job_name: dsk-mysql-agent-60s
+        scrape_interval: 60s
+        metrics_path: /metrics/60s
+        url: localhost:{{ mysql_agent_port | default('19104') }}
+        filtering_configs:
+          rule: drop
\ No newline at end of file
diff --git a/templates/plan-maria-agent-config.yml.j2 b/templates/plan-maria-agent-config.yml.j2
new file mode 100644
index 0000000..5d831a3
--- /dev/null
+++ b/templates/plan-maria-agent-config.yml.j2
@@ -0,0 +1,14 @@
+agent:
+  metadata:
+    agent_name: "{{ plan_maria_agent_name | default('dsk-plan-maria-agent') }}"
+    cluster_id: "{{ plan_maria_agent_cluster | default('unknown') }}"
+  data_source_name:
+    user: {{ maria_user_name | default('') }}
+    password: {{ maria_user_password | default('') }}
+    address: {{ maria_database_address | default('') }}
+    port: {{ maria_database_port | default('') }}
+    DBName: {{ maria_database_name | default('') }}
+  explain:
+    scrape_interval: {{ scrape_interval | default('5s') }}
+    scrape_timeout: {{ scrape_timeout | default('5s') }}
+    slow_query_standard: {{ slow_query_standard | default('1s') }}
\ No newline at end of file
diff --git a/templates/plan-mysql-agent-config.yml.j2 b/templates/plan-mysql-agent-config.yml.j2
new file mode 100644
index 0000000..327d306
--- /dev/null
+++ b/templates/plan-mysql-agent-config.yml.j2
@@ -0,0 +1,14 @@
+agent:
+  metadata:
+    agent_name: "{{ plan_mysql_agent_name | default('dsk-plan-mysql-agent') }}"
+    cluster_id: "{{ plan_mysql_agent_cluster | default('unknown') }}"
+  data_source_name:
+    user: {{ mysql_user_name | default('') }}
+    password: {{ mysql_user_password | default('') }}
+    address: {{ mysql_database_address | default('') }}
+    port: {{ mysql_database_port | default('') }}
+    DBName: {{ mysql_database_name | default('') }}
+  explain:
+    scrape_interval: {{ scrape_interval | default('5s') }}
+    scrape_timeout: {{ scrape_timeout | default('5s') }}
+    slow_query_standard: {{ slow_query_standard | default('1s') }}
\ No newline at end of file
diff --git a/templates/plan-postgres-agent-config.yml.j2 b/templates/plan-postgres-agent-config.yml.j2
index 29ddb00..9d43291 100644
--- a/templates/plan-postgres-agent-config.yml.j2
+++ b/templates/plan-postgres-agent-config.yml.j2
@@ -2,16 +2,16 @@ agent:
   metadata:
     agent_name: "{{ plan_postgres_agent_name | default('dsk-plan-postgres-agent') }}"
   data_source_name:
-    user: "{{ plan_postgres_user_name | default('') }}"
-    password: "{{ plan_postgres_user_password | default('') }}"
-    address: "{{ plan_postgres_database_address | default('') }}"
-    port: "{{ plan_postgres_database_port | default('') }}"
-    DBName: "{{ plan_postgres_database_name | default('') }}"
+    user: {{ plan_postgres_user_name | default('') }}
+    password: {{ plan_postgres_user_password | default('') }}
+    address: {{ plan_postgres_database_address | default('') }}
+    port: {{ plan_postgres_database_port | default('') }}
+    DBName: {{ plan_postgres_database_name | default('') }}
   explain:
-    scrape_interval: "{{ plan_postgres_scrape_interval | default('30s') }}"
-    scrape_timeout: "{{ plan_postgres_scrape_timeout | default('5s') }}"
-    slow_query_standard: "{{ plan_postgres_slow_query_standard | default('5s') }}"
-    executor_number: "{{ plan_postgres_executor_number | default('10') }}"
-    sender_number: "{{ plan_postgres_sender_number | default('10') }}"
-    activity_query_buffer: "{{ plan_postgres_activity_query_buffer | default('50') }}"
-    plan_sender_buffer: "{{ plan_postgres_plan_sender_buffer | default('50') }}"
+    scrape_interval: {{ plan_postgres_scrape_interval | default('30s') }}
+    scrape_timeout: {{ plan_postgres_scrape_timeout | default('5s') }}
+    slow_query_standard: {{ plan_postgres_slow_query_standard | default('5s') }}
+    executor_number: {{ plan_postgres_executor_number | default('10') }}
+    sender_number: {{ plan_postgres_sender_number | default('10') }}
+    activity_query_buffer: {{ plan_postgres_activity_query_buffer | default('50') }}
+    plan_sender_buffer: {{ plan_postgres_plan_sender_buffer | default('50') }}
\ No newline at end of file
diff --git a/templates/postgres-agent-config.yml.j2 b/templates/postgres-agent-config.yml.j2
index cd5fb32..7065daa 100644
--- a/templates/postgres-agent-config.yml.j2
+++ b/templates/postgres-agent-config.yml.j2
@@ -7,9 +7,9 @@ agent:
       port: 19187
       args:
         - --extend.query-path=/etc/datasaker/dsk-postgres-agent/queries.yaml
-        - --data-source-user="{{ postgres_user_name | default('') }}"
-        - --data-source-pass="{{ postgres_user_password | default('') }}"
-        - --data-source-uri="{{ postgres_database_address | default('') }}":"{{ postgres_database_port | default('') }}"
+        - --data-source-user={{ postgres_user_name | default('') }}
+        - --data-source-pass={{ postgres_user_password | default('') }}
+        - --data-source-uri={{ postgres_database_address | default('') }}":"{{ postgres_database_port | default('') }}
     scrape_interval: 15s
     scrape_timeout: 5s
     scrape_configs: