diff --git a/changes/changelog.d/358.enhancement b/changes/changelog.d/358.enhancement
index 24f8a5dd3..1cc36b476 100644
--- a/changes/changelog.d/358.enhancement
+++ b/changes/changelog.d/358.enhancement
@@ -86,7 +86,7 @@ Update the funkwhale.conf configuration of your server's reverse-proxy::
 
     sudo nano /etc/nginx/sites-enabled/funkwhale.conf
     upstream fw {
-        # depending on your setup, you may want to udpate this
+        # depending on your setup, you may want to update this
         server ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT};
     }
     map $http_upgrade $connection_upgrade {
diff --git a/deploy/docker.nginx.template b/deploy/docker.nginx.template
index 9a486908c..d73a1c4b6 100644
--- a/deploy/docker.nginx.template
+++ b/deploy/docker.nginx.template
@@ -1,5 +1,5 @@
 upstream funkwhale-api {
-    # depending on your setup, you may want to udpate this
+    # depending on your setup, you may want to update this
     server api:5000;
 }
 
diff --git a/deploy/docker.proxy.template b/deploy/docker.proxy.template
index 574df5ae5..319f287e7 100644
--- a/deploy/docker.proxy.template
+++ b/deploy/docker.proxy.template
@@ -1,5 +1,5 @@
 upstream fw {
-    # depending on your setup, you may want to udpate this
+    # depending on your setup, you may want to update this
     server ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT};
 }
 map $http_upgrade $connection_upgrade {
diff --git a/deploy/env.prod.sample b/deploy/env.prod.sample
index caca55f37..3918f95e3 100644
--- a/deploy/env.prod.sample
+++ b/deploy/env.prod.sample
@@ -51,7 +51,7 @@ FUNKWHALE_PROTOCOL=https
 # EMAIL_CONFIG=smtp+ssl://user@:password@youremail.host:465
 # EMAIL_CONFIG=smtp+tls://user@:password@youremail.host:587
 
-# The email address to use to send systme emails. By default, we will
+# The email address to use to send system emails.
 # DEFAULT_FROM_EMAIL=noreply@yourdomain
 
 # Depending on the reverse proxy used in front of your funkwhale instance,
diff --git a/deploy/nginx.template b/deploy/nginx.template
index 7975fdc55..1eb011d4e 100644
--- a/deploy/nginx.template
+++ b/deploy/nginx.template
@@ -1,7 +1,7 @@
 # This file was generated from funkwhale.template
 
 upstream funkwhale-api {
-    # depending on your setup, you may want to udpate this
+    # depending on your setup, you may want to update this
     server ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT};
 }