diff --git a/SprintLib/testers/BaseTester.py b/SprintLib/testers/BaseTester.py
index 7d82893..6930c75 100644
--- a/SprintLib/testers/BaseTester.py
+++ b/SprintLib/testers/BaseTester.py
@@ -56,7 +56,9 @@ class BaseTester:
         self.solution = solution
 
     def execute(self):
-        mkdir(str(self.solution.id))
+        if not exists("solutions"):
+            mkdir("solutions")
+        mkdir("solutions/" + str(self.solution.id))
         for file in SolutionFile.objects.filter(solution=self.solution):
             dirs = file.path.split('/')
             for i in range(len(dirs) - 1):
@@ -67,7 +69,7 @@ class BaseTester:
                 fs.write(get_bytes(file.fs_id))
         self.solution.result = CONSTS["testing_status"]
         self.solution.save()
-        docker_command = f"docker run --name solution_{self.solution.id} --volume=/sprint-data/worker/{self.solution.id}:/{self.working_directory} -t -d {self.solution.language.image}"
+        docker_command = f"docker run --name solution_{self.solution.id} --volume=/sprint-data/solutions/{self.solution.id}:/{self.working_directory} -t -d {self.solution.language.image}"
         print(docker_command)
         call(docker_command, shell=True)
         print("Container created")
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3641e6f..1e37b0f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -74,5 +74,5 @@ services:
       - postgres
       - storage
     volumes:
-      - /sprint-data/worker:/usr/src/app
+      - /sprint-data/solutions:/usr/src/app/solutions
       - /var/run/docker.sock:/var/run/docker.sock
\ No newline at end of file