diff --git a/contrib/scripts/install/dialog.sh b/contrib/scripts/install/dialog.sh
index cacf60d54b..7259931700 100644
--- a/contrib/scripts/install/dialog.sh
+++ b/contrib/scripts/install/dialog.sh
@@ -1445,7 +1445,7 @@ sudo -u mayan \
 dialog --infobox "Preparing static files" 3 70
 sudo -u mayan \
     MAYAN_MEDIA_ROOT=$MAYAN_MEDIA_ROOT \
-    $MAYAN_BIN collectstatic --noinput > /dev/null
+    $MAYAN_BIN preparestatic --noinput > /dev/null
 
 # Create supervisor file for gunicorn (frontend), 3 background workers, and the scheduler for periodic tasks
 cat > /etc/supervisor/conf.d/mayan.conf <<EOF
diff --git a/contrib/scripts/install/production.sh b/contrib/scripts/install/production.sh
index f5b0de2b56..8ac83b1030 100644
--- a/contrib/scripts/install/production.sh
+++ b/contrib/scripts/install/production.sh
@@ -161,7 +161,7 @@ priority = 998
 EOF
 
 echo -e "\n -> Collecting the static files \n"
-mayan-edms.py collectstatic --noinput
+mayan-edms.py preparestatic --noinput
 
 echo -e "\n -> Making the installation directory readable and writable by the webserver user \n"
 chown www-data:www-data ${INSTALLATION_DIRECTORY} -R
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 3ce98e5eac..1aa147a3df 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -55,13 +55,13 @@ chown mayan:mayan /var/lib/mayan -R
 initialize() {
     echo "mayan: initialize()"
     su mayan -c "${MAYAN_BIN} initialsetup --force"
-    su mayan -c "${MAYAN_BIN} collectstatic --noinput --clear"
+    su mayan -c "${MAYAN_BIN} preparestatic --noinput --clear"
 }
 
 upgrade() {
     echo "mayan: upgrade()"
     su mayan -c "${MAYAN_BIN} performupgrade"
-    su mayan -c "${MAYAN_BIN} collectstatic --noinput --clear"
+    su mayan -c "${MAYAN_BIN} preparestatic --noinput --clear"
 }
 
 start() {
diff --git a/docs/chapters/deploying.rst b/docs/chapters/deploying.rst
index c5b364e156..179ca5e5b7 100644
--- a/docs/chapters/deploying.rst
+++ b/docs/chapters/deploying.rst
@@ -82,7 +82,7 @@ Collect the static files:
 ::
 
     sudo -u mayan MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
-    /opt/mayan-edms/bin/mayan-edms.py collectstatic --noinput
+    /opt/mayan-edms/bin/mayan-edms.py preparestatic --noinput
 
 Create the supervisor file at ``/etc/supervisor/conf.d/mayan.conf``:
 --------------------------------------------------------------------
@@ -244,7 +244,7 @@ Collect the static files:
 ::
 
     sudo -u mayan MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \
-    /opt/mayan-edms/bin/mayan-edms.py collectstatic --noinput
+    /opt/mayan-edms/bin/mayan-edms.py preparestatic --noinput
 
 Create the RabbitMQ user and vhost:
 -----------------------------------
diff --git a/docs/releases/3.2.rst b/docs/releases/3.2.rst
index d8a6409058..5cf8356d6c 100644
--- a/docs/releases/3.2.rst
+++ b/docs/releases/3.2.rst
@@ -81,7 +81,7 @@ Migrate existing database schema with::
 
 Add new static media::
 
-    $ mayan-edms.py collectstatic --noinput
+    $ mayan-edms.py preparestatic --noinput
 
 The upgrade procedure is now complete.
 
diff --git a/docs/topics/faq.rst b/docs/topics/faq.rst
index 6baea69cdb..5e4693ae1d 100644
--- a/docs/topics/faq.rst
+++ b/docs/topics/faq.rst
@@ -185,7 +185,7 @@ Django's development server doesn't serve static files unless the DEBUG option
 is set to True, this mode of operation should only be used for development or
 testing. For production deployments the management command::
 
-    $ mayan-edms.py collectstatic
+    $ mayan-edms.py preparestatic
 
 should be used and the resulting static folder served from a webserver.
 For more information check the