diff --git a/Dockerfile b/Dockerfile
index 9aae39e418fa55577c67eaa5aa34f65ae7f79a16..f6de520ef4f4cd98046d10b62fa338bfa77758d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,21 +11,23 @@ RUN apt-get update -qq \
   && apt-get clean \
   && rm -rf /var/lib/apt
 
+RUN apt-get update && apt-get upgrade --assume-yes
+
 RUN pip install --upgrade pip
 
 COPY . .
 
 
 RUN if [ "$with_models" = "true" ]; then  \
-        # install only the dependencies first
-        pip install -e .;  \
-        # initialize the language models
-        if [ ! -z "$models" ]; then \
-                  ./install_models.py --load_only_lang_codes "$models";   \
-        else \
-                  ./install_models.py;  \
-        fi \
-    fi
+  # install only the dependencies first
+  pip install -e .;  \
+  # initialize the language models
+  if [ ! -z "$models" ]; then \
+  ./install_models.py --load_only_lang_codes "$models";   \
+  else \
+  ./install_models.py;  \
+  fi \
+  fi
 # Install package from source code
 RUN pip install . \
   && pip cache purge
diff --git a/docker-compose.cuda.yml b/docker-compose.cuda.yml
index 5f8beaaf3d7b60f4f02c7b998b1cd6aba907426f..453524302db11dce895e1ee5a8efdf194cf329cb 100644
--- a/docker-compose.cuda.yml
+++ b/docker-compose.cuda.yml
@@ -9,4 +9,10 @@ services:
     restart: unless-stopped
     ports:
       - 5000:5000
-    command: --gpus all
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: 1
+              capabilities: [gpu]
diff --git a/docker/Dockerfile.cuda b/docker/Dockerfile.cuda
index 337a32d8464292b2f8dca446e71a94b481e4c7f6..6bd1603dba0d6c04a3a8c7d46bd62022baac8941 100644
--- a/docker/Dockerfile.cuda
+++ b/docker/Dockerfile.cuda
@@ -12,7 +12,9 @@ RUN apt-get update -qq \
     && apt-get clean \
     && rm -rf /var/lib/apt
 
-RUN pip3 install --upgrade pip
+RUN apt-get update && apt-get upgrade --assume-yes
+
+RUN pip3 install --upgrade pip && apt-get remove python3-pip --assume-yes
 
 COPY . .
 
diff --git a/requirements.txt b/requirements.txt
index 9ea3949193927a4e41ffe54b12499f1437a7208e..87ad66149066636004613d8b1b38ab74cbbde9be 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ Flask==2.1.2
 flask-swagger==0.2.14
 flask-swagger-ui==3.36.0
 Flask-Limiter==2.4.5.1
-waitress==2.1.1
+waitress==2.1.2
 expiringdict==1.2.1
 pyicu>=2.8
 pycld2==0.41