diff --git a/modules/install/ToolsInstaller.py b/modules/install/ToolsInstaller.py
index 7a758b1..a4f1922 100644
--- a/modules/install/ToolsInstaller.py
+++ b/modules/install/ToolsInstaller.py
@@ -1,4 +1,5 @@
 import json
+import platform
 import subprocess
 
 
@@ -24,17 +25,26 @@ class ToolsInstaller:
 
     def docker(self):
         """Install the Docker service on the machine"""
+
         print("Removing any old installations")
         subprocess.run("apt-get remove docker docker-engine docker.io containerd runc", shell=True)
         print("Set up docker apt-key")
         subprocess.run("apt-get update", shell=True)
-        subprocess.run("apt-get install apt-transport-https ca-certificates curl gnupg-agent software-properties-common", shell=True)
+        subprocess.run(
+            "apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common",
+            shell=True)
         subprocess.run("curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -", shell=True)
         subprocess.run("apt-key fingerprint 0EBFCD88", shell=True)
-        subprocess.run("add-apt-repository "
-                       "\"deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs)stable\"", shell=True)
+        if "ubuntu" in platform.version().lower():
+            subprocess.run("add-apt-repository "
+                           "\"deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable\"",
+                           shell=True)
+        elif "debian" in platform.version().lower():
+            subprocess.run("add-apt-repository "
+                           "\"deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable\"",
+                           shell=True)
         print("Installing the Service")
         subprocess.run("apt-get update", shell=True)
-        subprocess.run("apt-get install docker-ce docker-ce-cli containerd.io", shell=True)
+        subprocess.run("apt-get install -y docker-ce docker-ce-cli containerd.io", shell=True)
         print("Checking the installation")
         subprocess.run("docker run hello-world", shell=True)