diff --git a/services/mongo/service.json b/services/mongo/service.json
index f65759c8..81fab375 100644
--- a/services/mongo/service.json
+++ b/services/mongo/service.json
@@ -59,16 +59,16 @@
       ]
     },
     "executable": {
-      "win32": "mongo\\bin\\mongod.exe",
-      "darwin": "mongo/bin/mongod",
-      "linux": "mongo/bin/mongod",
-      "default": "mongo\\bin\\mongod.exe"
+      "win32": "mongo\\win32\\bin\\mongod.exe",
+      "darwin": "mongo/darwin/bin/mongod",
+      "linux": "mongo/linux/bin/mongod",
+      "default": "mongo\\win32\\bin\\mongod.exe"
     },
     "executablecli": {
-      "win32": "mongo\\bin\\mongosh.exe",
-      "darwin": "mongo/bin/mongosh",
-      "linux": "mongo/bin/mongosh",
-      "default": "mongo\\bin\\mongosh.exe"
+      "win32": "mongo\\win32\\bin\\mongosh.exe",
+      "darwin": "mongo/darwin/bin/mongosh",
+      "linux": "mongo/linux/bin/mongosh",
+      "default": "mongo\\win32\\bin\\mongosh.exe"
     },
     "datapath": "database",
     "commandline": {
diff --git a/services/postgredb-admin/service.json b/services/postgredb-admin/service.json
index 02687373..29629eea 100644
--- a/services/postgredb-admin/service.json
+++ b/services/postgredb-admin/service.json
@@ -10,19 +10,19 @@
     "execservice": { "id": "python" },
     "setup": {
       "win32": [
-        "-m pip install --ignore-installed --use-pep517 --user -r ${SERVICE_PATH}\\requirements.txt",
+        "-m pip install --ignore-installed --use-pep517 --target=${SERVICE_PATH}\\__packages__ -r ${SERVICE_PATH}\\requirements.txt",
         "; copy ${SERVICE_PATH}\\config\\config_local.py ${SERVICE_PATH}\\__packages__\\pgadmin4\\config_local.py"
       ],
       "darwin": [
-        "-m pip install --ignore-installed --use-pep517 --user -r ${SERVICE_PATH}/requirements.txt",
+        "-m pip install --ignore-installed --use-pep517 --target=${SERVICE_PATH}/__packages__ -r ${SERVICE_PATH}/requirements.txt",
         "; /bin/cp -r ${SERVICE_PATH}/config/config_local.py ${SERVICE_PATH}/__packages__/pgadmin4/config_local.py"
       ],
       "linux": [
-        "-m pip install --ignore-installed --use-pep517 --user -r ${SERVICE_PATH}/requirements.txt",
+        "-m pip install --ignore-installed --use-pep517 --target=${SERVICE_PATH}/__packages__ -r ${SERVICE_PATH}/requirements.txt",
         "; /bin/cp -r ${SERVICE_PATH}/config/config_local.py ${SERVICE_PATH}/__packages__/pgadmin4/config_local.py"
       ],
       "default": [
-        "-m pip install --ignore-installed --use-pep517 --user -r ${SERVICE_PATH}\\requirements.txt",
+        "-m pip install --ignore-installed --use-pep517 --target=${SERVICE_PATH}\\__packages__ -r ${SERVICE_PATH}\\requirements.txt",
         "; copy ${SERVICE_PATH}\\config\\config_local.py ${SERVICE_PATH}\\__packages__\\pgadmin4\\config_local.py"
       ]
     },