diff --git a/tsg-9140-scripts/roles/docker/tasks/main.yml b/tsg-9140-scripts/roles/docker/tasks/main.yml
index cb0ef6e3..eba92979 100644
--- a/tsg-9140-scripts/roles/docker/tasks/main.yml
+++ b/tsg-9140-scripts/roles/docker/tasks/main.yml
@@ -1,4 +1,15 @@
 - name: "docker: copy daemon.json to target"
   copy:
     src: '{{ role_path }}/files/daemon.json'
-    dest: /etc/docker/
\ No newline at end of file
+    dest: /etc/docker/
+
+- name: "docker: download docker-compose"
+  get_url:
+    url: https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64
+    dest: /usr/bin/docker-compose
+    mode: '0755'
+
+- name: "enable docker"
+  systemd:
+    name: docker
+    enabled: yes
\ No newline at end of file
diff --git a/tsg-9140-scripts/roles/tsg-diagnose/files/prestart b/tsg-9140-scripts/roles/tsg-diagnose/files/prestart
deleted file mode 100644
index 5e67a4d7..00000000
--- a/tsg-9140-scripts/roles/tsg-diagnose/files/prestart
+++ /dev/null
@@ -1,4 +0,0 @@
-[Service]
-ExecStartPre=/usr/bin/docker load < /opt/tsg/tsg-diagnose/images/badssl.tar
-ExecStartPre=/usr/bin/docker load < /opt/tsg/tsg-diagnose/images/unittest.tar
-ExecStartPre=/usr/bin/docker load < /opt/tsg/tsg-diagnose/images/wpr.tar
\ No newline at end of file
diff --git a/tsg-9140-scripts/roles/tsg-diagnose/files/prestart.conf b/tsg-9140-scripts/roles/tsg-diagnose/files/prestart.conf
new file mode 100644
index 00000000..6811ae47
--- /dev/null
+++ b/tsg-9140-scripts/roles/tsg-diagnose/files/prestart.conf
@@ -0,0 +1,4 @@
+[Service]
+ExecStartPre=/bin/sh -c "docker load < /opt/tsg/tsg-diagnose/images/badssl.tar"
+ExecStartPre=/bin/sh -c "docker load < /opt/tsg/tsg-diagnose/images/unittest.tar"
+ExecStartPre=/bin/sh -c "docker load < /opt/tsg/tsg-diagnose/images/wpr.tar"
\ No newline at end of file
diff --git a/tsg-9140-scripts/roles/tsg-diagnose/files/tsg-diagnose.service b/tsg-9140-scripts/roles/tsg-diagnose/files/tsg-diagnose.service
new file mode 100644
index 00000000..540e4b2f
--- /dev/null
+++ b/tsg-9140-scripts/roles/tsg-diagnose/files/tsg-diagnose.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Tsg diagnose
+Requires=docker.service
+After=docker.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+WorkingDirectory=/opt/tsg/tsg-diagnose/compose/%i
+ExecStart=/bin/sh -c "docker-compose down --remove-orphans; docker-compose up -d --remove-orphans"
+ExecStop=/bin/sh -c "docker-compose down --remove-orphans"
+
+[Install]
+WantedBy=multi-user.target
diff --git a/tsg-9140-scripts/roles/tsg-diagnose/tasks/main.yml b/tsg-9140-scripts/roles/tsg-diagnose/tasks/main.yml
index fad8a6d1..fa006506 100644
--- a/tsg-9140-scripts/roles/tsg-diagnose/tasks/main.yml
+++ b/tsg-9140-scripts/roles/tsg-diagnose/tasks/main.yml
@@ -34,8 +34,15 @@
     dest: /opt/tsg/tsg-diagnose/.badssl_cert_dict
     remote_src: yes
 
+- name: "copy tsg-diagnose.service file to dest"
+  copy:
+    src: "{{ role_path }}/files/tsg-diagnose.service"
+    dest: /usr/lib/systemd/system/tsg-diagnose.service
+    mode: 0644
+
+
 - name: "copy prestart file to tsg-diagnose.service.d"
   copy:
-    src: "{{ role_path }}/files/prestart"
+    src: "{{ role_path }}/files/prestart.conf"
     dest: /usr/lib/systemd/system/tsg-diagnose.service.d/
-    mode: 0644
\ No newline at end of file
+    mode: 0644