diff --git a/.vscode/tasks-scripts/start.bat b/.vscode/tasks-scripts/start.bat
deleted file mode 100644
index 4e03b0abe1..0000000000
--- a/.vscode/tasks-scripts/start.bat
+++ /dev/null
@@ -1,37 +0,0 @@
-@echo off
-
-set root=%~dp0..\..
-
-@REM if "%2%"=="Local" goto onLocal
-@REM if "%2%"=="Docker" goto onDocker
-
-
-@REM :onLocal
-if "%1%"=="Start" goto onStartLocal
-if "%1%"=="Restart" goto onRestartLocal
-if "%1%"=="Stop" goto onStopLocal
-
-:onStartLocal
-"%root%\\build\\start\start.bat" start
-
-:onRestartLocal
-"%root%\\build\\start\\restart.bat" start
-
-:onStopLocal
-"%root%\\build\\start\\stop.bat" start 
-
-
-@REM :onDocker
-@REM if "%1%"=="Start" goto onStartDocker
-@REM if "%1%"=="Restart" goto onRestartDocker
-@REM if "%1%"=="Stop" goto onStopDocker
-
-@REM :onStartDocker
-@REM echo "Start docker"
-@REM "%root%\\build\\start\start.backend.docker.bat" start
-
-@REM :onRestartDocker
-@REM "%root%\\build\\start\\restart.backend.docker.bat" start
-
-@REM :onStopDocker
-@REM "%root%\\build\\start\\stop.backend.docker.bat" start 
\ No newline at end of file
diff --git a/.vscode/tasks-scripts/start.sh b/.vscode/tasks-scripts/start.sh
deleted file mode 100644
index 3d9441d308..0000000000
--- a/.vscode/tasks-scripts/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-scriptLocation=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-root=$(builtin cd $scriptLocation/../../; pwd)
-
-if [ "$1" = "Start" ]
-  then (sh $root/build/start/start.backend.docker.sh)
-elif [ "$1" = "Restart" ]
-  then (sh $root/build/start/restart.backend.docker.sh)
-elif [ "$1" = "Stop" ]
-  then (sh $root/build/start/stop.backend.docker.sh)
-else
-  echo "Unknown command"
-fi
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 4a5027b0d8..de469f2e5f 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -7,21 +7,9 @@
   },
   "tasks": [
     {
-      "label": "Workspace folder test",
+      "label": "Frontend | Start",
       "type": "shell",
-      "command": "echo ${workspaceFolder} && pause",
-      "osx": {
-        "command": "echo ${workspaceFolder} && read -p 'Press any key ...'"
-      }
-    },
-    {
-      "label": "Backend  | Start",
-      "type": "shell",
-      "command": "${workspaceFolder}/.vscode/tasks-scripts/start.sh ${input:start-param} "
-      // "windows": {
-      // "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param}"
-      // "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param} ${input:local-docker}"
-      // }
+      "command": "cd ${workspaceFolder} ; yarn start"
     },
     {
       "label": "Backend  | Build",
@@ -32,19 +20,29 @@
       }
     },
     {
-      "label": "Frontend | Start",
+      "label": "Backend  | Start",
       "type": "shell",
-      "command": "cd ${workspaceFolder} ; yarn start"
+      "command": "${workspaceFolder}/build/start/start.backend.docker.sh",
+      "windows": {
+        "command": "${workspaceFolder}\\build\\start\\start.bat"
+      }
+    },
+    {
+      "label": "Backend  | Restart",
+      "type": "shell",
+      "command": "${workspaceFolder}/build/start/restart.backend.docker.sh",
+      "windows": {
+        "command": "${workspaceFolder}\\build\\start\\restart.bat"
+      }
+    },
+    {
+      "label": "Backend  | Stop",
+      "type": "shell",
+      "command": "${workspaceFolder}/build/start/stop.backend.docker.sh",
+      "windows": {
+        "command": "${workspaceFolder}\\build\\start\\stop.bat"
+      }
     }
-
-    // {
-    //   "label": "Migrate",
-    //   "type": "shell",
-    //   "command": "${workspaceFolder}\\build\\runMigrations.sh",
-    //   "windows": {
-    //     "command": "${workspaceFolder}\\build\\runMigrations.bat"
-    //   }
-    // }
   ],
   "inputs": [
     {