diff --git a/PYROSW.py b/PYROSW.py
index c67d284..908f7ff 100755
--- a/PYROSW.py
+++ b/PYROSW.py
@@ -106,12 +106,12 @@ PYROS_CMD = PYROS_CMD.rstrip()
 if DOCKER_OUT_CONTAINER:
     # cd docker/
     os.chdir('docker')
-    # docker-compose up -d
-    res = subprocess.run("docker-compose exec pyros python3 pyros.py",shell=True,stdout=subprocess.DEVNULL)
+    # docker compose up -d
+    res = subprocess.run("docker compose exec pyros python3 pyros.py",shell=True,stdout=subprocess.DEVNULL)
     if res.returncode != 0:
-        run('docker-compose up -d')
+        run('docker compose up -d')
         sleep(5)
-    PYROS_CMD = 'docker-compose exec pyros ' + PYROS_CMD
+    PYROS_CMD = 'docker compose exec pyros ' + PYROS_CMD
 
 if VENV:
     does_venv_folder_exists = os.path.exists("./venv")
diff --git a/docker/PYROS_DOCKER_BUILD.bat b/docker/PYROS_DOCKER_BUILD.bat
index 1927c47..d07cdcb 100755
--- a/docker/PYROS_DOCKER_BUILD.bat
+++ b/docker/PYROS_DOCKER_BUILD.bat
@@ -3,5 +3,5 @@
 [ ! -d "../vendor/guitastro/" ] && git clone https://gitlab.irap.omp.eu/guitastrolib/guitastro.git ../vendor/guitastro/
 
 export CURRENT_UID=$(id -u) 
-docker-compose build
+docker compose build
 
diff --git a/docker/PYROS_DOCKER_BUILD.sh b/docker/PYROS_DOCKER_BUILD.sh
index 8b1ae6b..8c60ecd 100755
--- a/docker/PYROS_DOCKER_BUILD.sh
+++ b/docker/PYROS_DOCKER_BUILD.sh
@@ -8,6 +8,6 @@ then
 echo "You can't run this script as root, use a normal user"
 exit 1
 else
-docker-compose build
+docker compose build
 fi
 
diff --git a/docker/PYROS_DOCKER_INSTALL b/docker/PYROS_DOCKER_INSTALL
index 266626f..e76ce47 100755
--- a/docker/PYROS_DOCKER_INSTALL
+++ b/docker/PYROS_DOCKER_INSTALL
@@ -18,5 +18,5 @@ done
 
 # db container is ready to execture queries
 # We can now start the installation
-docker-compose exec pyros python3 pyros.py install
+docker compose exec pyros python3 pyros.py install
 
diff --git a/docker/PYROS_DOCKER_INSTALL.bat b/docker/PYROS_DOCKER_INSTALL.bat
index 81cba93..9438238 100755
--- a/docker/PYROS_DOCKER_INSTALL.bat
+++ b/docker/PYROS_DOCKER_INSTALL.bat
@@ -1,2 +1,2 @@
-docker-compose exec pyros python3 pyros.py install
+docker compose exec pyros python3 pyros.py install
 
diff --git a/docker/PYROS_DOCKER_RUN b/docker/PYROS_DOCKER_RUN
index 3d16a41..29b8328 100755
--- a/docker/PYROS_DOCKER_RUN
+++ b/docker/PYROS_DOCKER_RUN
@@ -13,7 +13,7 @@ echo "LOG files :"
 # 1) Web server
 #
 # - Display log on current terminal
-#docker-compose exec pyros python3 pyros.py start webserver $@
+#docker compose exec pyros python3 pyros.py start webserver $@
 # - Save log in file
 docker compose exec pyros python3 pyros.py -d start -o tnc -fg webserver > ../../LOG_PYROS_webserver.log 2>&1 &
 #docker exec pyros python3 pyros.py -d start -o guitalens webserver >> ../../LOG_PYROS_webserver.log 2>&1 &
diff --git a/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY b/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY
index a8bcefb..fb9c761 100755
--- a/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY
+++ b/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY
@@ -7,7 +7,7 @@ if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] ; then
 fi
 
 docker compose exec pyros python3 pyros.py -d start webserver $@
-#docker-compose exec pyros python3 pyros.py -d start webserver $@
+#docker compose exec pyros python3 pyros.py -d start webserver $@
 #docker compose exec pyros python3 pyros.py -d start -o tnc -fg webserver $@
 #docker exec -it pyros python3 pyros.py start webserver $@
 #docker exec -it pyros python3 pyros.py -d start -o tnc webserver $@
diff --git a/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY.bat b/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY.bat
index 3ec0ac1..3aef6f4 100755
--- a/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY.bat
+++ b/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY.bat
@@ -1,2 +1,2 @@
-docker-compose exec pyros python3 pyros.py start webserver %*
+docker compose exec pyros python3 pyros.py start webserver %*
 
diff --git a/docker/PYROS_DOCKER_SHELL b/docker/PYROS_DOCKER_SHELL
index 054fa0d..51e2258 100755
--- a/docker/PYROS_DOCKER_SHELL
+++ b/docker/PYROS_DOCKER_SHELL
@@ -6,5 +6,5 @@ then
     echo "pyros-db or pyros weren't running, starting them..."
     ./PYROS_DOCKER_START.bat
 fi
-docker-compose exec pyros bash $@
+docker compose exec pyros bash $@
 
diff --git a/docker/PYROS_DOCKER_SHELL.bat b/docker/PYROS_DOCKER_SHELL.bat
index f33869b..dc05179 100755
--- a/docker/PYROS_DOCKER_SHELL.bat
+++ b/docker/PYROS_DOCKER_SHELL.bat
@@ -1,2 +1,2 @@
-docker-compose exec pyros bash
+docker compose exec pyros bash
 
diff --git a/docker/PYROS_DOCKER_START.bat b/docker/PYROS_DOCKER_START.bat
index 371a1f6..658afdf 100755
--- a/docker/PYROS_DOCKER_START.bat
+++ b/docker/PYROS_DOCKER_START.bat
@@ -1,4 +1,4 @@
 set CURRENT_UID=1001
 set COMPUTER_HOSTNAME=%COMPUTERNAME%
-docker-compose down --remove-orphans
-docker-compose up -d
+docker compose down --remove-orphans
+docker compose up -d
diff --git a/docker/PYROS_DOCKER_START.sh b/docker/PYROS_DOCKER_START.sh
index 11e7e70..1677eb1 100755
--- a/docker/PYROS_DOCKER_START.sh
+++ b/docker/PYROS_DOCKER_START.sh
@@ -3,11 +3,11 @@ export COMPUTER_HOSTNAME=$HOSTNAME
 
 echo
 echo "First STOP just in case:"
-docker-compose down --remove-orphans
+docker compose down --remove-orphans
 
 echo
 echo "Then START:"
-docker-compose up -d
+docker compose up -d
 
 # See started containers
 echo
diff --git a/docker/PYROS_DOCKER_STOP.bat b/docker/PYROS_DOCKER_STOP.bat
index abf20ea..7ac9bb4 100755
--- a/docker/PYROS_DOCKER_STOP.bat
+++ b/docker/PYROS_DOCKER_STOP.bat
@@ -1,3 +1,3 @@
 export CURRENT_UID=$(id -u)
-docker-compose down
+docker compose down
 
diff --git a/docker/PYROS_DOCKER_TEST b/docker/PYROS_DOCKER_TEST
index 025f37f..ee4d774 100755
--- a/docker/PYROS_DOCKER_TEST
+++ b/docker/PYROS_DOCKER_TEST
@@ -6,5 +6,5 @@ then
     echo "pyros-db or pyros weren't running, starting them..."
     ./PYROS_DOCKER_START.bat
 fi
-docker-compose exec pyros python3 pyros.py test $@
+docker compose exec pyros python3 pyros.py test $@
 
diff --git a/docker/PYROS_DOCKER_TEST.bat b/docker/PYROS_DOCKER_TEST.bat
index 27e2108..25ef3fb 100755
--- a/docker/PYROS_DOCKER_TEST.bat
+++ b/docker/PYROS_DOCKER_TEST.bat
@@ -1,2 +1,2 @@
-docker-compose exec pyros python3 pyros.py test
+docker compose exec pyros python3 pyros.py test
 
diff --git a/docker/PYROS_DOCKER_UPDATE b/docker/PYROS_DOCKER_UPDATE
index 01d1ec1..27daf44 100755
--- a/docker/PYROS_DOCKER_UPDATE
+++ b/docker/PYROS_DOCKER_UPDATE
@@ -22,5 +22,5 @@ do
 done
 
 # 3) pyros.py update => update BD + doc + Guitastro requirements
-docker-compose exec pyros python3 pyros.py update
+docker compose exec pyros python3 pyros.py update
 
diff --git a/docker/PYROS_DOCKER_UPDATE.bat b/docker/PYROS_DOCKER_UPDATE.bat
index 68e2254..9cc3468 100755
--- a/docker/PYROS_DOCKER_UPDATE.bat
+++ b/docker/PYROS_DOCKER_UPDATE.bat
@@ -3,5 +3,5 @@
 # 2) (TODO) Update PyROS
 
 # 3) pyros.py update => update BD + doc + Guitastro requirements
-docker-compose exec pyros python3 pyros.py update
+docker compose exec pyros python3 pyros.py update
 
--
libgit2 0.21.2