diff --git a/defaults/main.yml b/defaults/main.yml
index 13450d9..e261351 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -28,12 +28,13 @@ datasaker_yum_repo: "http://nexus.exem-oss.org/repository/datasaker-amazonlinux-
 datasaker_yum_enabled: yes
 datasaker_yum_gpgcheck: no
 
+apt_sources_list: "/etc/apt/sources.list.d/datasaker.list"  
 apt_trusted_d_keyring: "/etc/apt/trusted.gpg.d/datasaker-archive-keyring.gpg"
 apt_usr_share_keyring: "/usr/share/keyrings/datasaker-archive-keyring.gpg"
 
 dsk_public_gpg_key: "https://dsk-agent-s3.s3.ap-northeast-2.amazonaws.com/dsk-agent-s3/public/public.gpg.key"
 
-datasaker_agents: []
+datasaker_agents: ['dsk-node-agent']
 
 uninstall: False
-datasaker_clean: False
\ No newline at end of file
+datasaker_clean: False
diff --git a/meta/.galaxy_install_info b/meta/.galaxy_install_info
new file mode 100644
index 0000000..bee023e
--- /dev/null
+++ b/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Thu Jun 15 08:26:46 2023
+version: 1.0.1
diff --git a/tasks/dsk-debian-pkg.yml b/tasks/dsk-debian-pkg.yml
index b6b28e9..fd763d5 100644
--- a/tasks/dsk-debian-pkg.yml
+++ b/tasks/dsk-debian-pkg.yml
@@ -16,6 +16,13 @@
     dest: "{{ tempdir.path }}/datasaker.gpg.key"
     force: yes
 
+- name: "Create {{ apt_usr_share_keyring }} if it doesn't exist"
+  file:
+    path: "{{ apt_usr_share_keyring }}"
+    state: touch
+    mode: "0644"
+  changed_when: False
+
 - name: "Ensure downloaded file for binary keyring"
   shell: "cat {{ tempdir.path }}/datasaker.gpg.key | sudo gpg --import --batch --no-default-keyring --keyring {{ apt_usr_share_keyring }}"
 
@@ -23,7 +30,7 @@
   copy:
     src: "{{ apt_usr_share_keyring }}"
     dest: "{{ apt_trusted_d_keyring }}"
-    mode: "0600"
+    mode: "0644"
     remote_src: yes
 
 - name: "Remove temporary directory for key manipulation"
@@ -35,7 +42,7 @@
   apt_repository:
     repo: "deb [signed-by={{ apt_usr_share_keyring }}] https://nexus.exem-oss.org/repository/debian-repos/ ubuntu main"
     state: present
-    filename: datasaker.list
+    filename: datasaker
 
 - name: "Check datasaker Agent"
   include_tasks: check-agent.yml
@@ -45,6 +52,7 @@
     name: "dsk-metric-sidecar"
     state: present
     update_cache: yes
+    force: yes
 
 - name: Make Datasaker Log Directory
   ansible.builtin.file:
@@ -66,12 +74,3 @@
   notify:
     - Reload systemd configuration
     - Restart {{ item }} service
-
-# - name: "Ensure datasaker agent is running"
-#   service:
-#     name: "{{ item }}"
-#     state: started
-#     enabled: yes
-#   with_items:
-#     - "{{ datasaker_agents }}"    
-
diff --git a/tasks/remove-datasaker.yml b/tasks/remove-datasaker.yml
index 3427c36..99b2781 100644
--- a/tasks/remove-datasaker.yml
+++ b/tasks/remove-datasaker.yml
@@ -1,10 +1,4 @@
 ---
-# - name: "Install metric sidecar"
-#   apt:
-#     name: "dsk-metric-sidecar"
-#     state: present
-#     update_cache: yes
-
 - name: Remove Datasaker Log Directory
   ansible.builtin.file:
     path: "/var/log/datasaker/{{ item }}"
@@ -51,4 +45,7 @@
   with_items:
     - /etc/datasaker
     - /var/log/datasaker
-  when: datasaker_clean == True
\ No newline at end of file
+    - "{{ apt_sources_list }}"
+    - "{{ apt_trusted_d_keyring }}"
+    - "{{ apt_usr_share_keyring }}"
+  when: datasaker_clean == True
diff --git a/templates/log-agent-config.yml.j2_bak b/templates/log-agent-config.yml.j2_bak
new file mode 100644
index 0000000..cc55c92
--- /dev/null
+++ b/templates/log-agent-config.yml.j2_bak
@@ -0,0 +1,37 @@
+agent:
+  metadata:
+    agent_name: "{{ log_agent_name | default('dsk-log-agent') }}"
+    cluster_id: "{{ log_agent_cluster_id | default('unknown') }}"
+  environment: "{{ log_agent_environment | default('etc') }}"
+  collect:
+    - paths:
+        {% if paths is defined and paths | length > 0 %}
+        {% for path in paths %}
+      - "{{ path | default('') }}"
+        {% endfor %}
+        {% else %}
+      - /var/log/*/*.log
+        {% endif %}
+
+        {% if exclude_paths is defined and exclude_paths | length > 0 %}
+      exclude_paths:
+        {% for exclude_path in exclude_paths %}
+        - "{{ exclude_path | default('') }}"
+        {% endfor %}
+        {% else %}
+      exclude_paths: []
+        {% endif %}
+
+        {% if keywords is defined and keywords | length > 0 %}
+      keywords:         
+        {% for keyword in keywords %}
+        - "{{ keyword | default('') }}"
+        {% endfor %}
+        {% else %}
+      keywords: []
+        {% endif %}        
+      tag: "{{ log_agent_tag | default('sample') }}"
+      service:
+        name: "{{ log_agent_service_name | default('test') }}"
+        category: "{{ log_agent_service_category | default('etc') }}"
+        type: "{{ log_agent_service_type | default('etc') }}"
\ No newline at end of file