diff --git a/.dockerignore b/.dockerignore
index 3299bb000..49502cc51 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,7 +8,6 @@
 !resources/locale/compiled
 !util/docker
 !util/openapi.php
-!vendor
 !web
 !templates
 !plugins
diff --git a/Dockerfile b/Dockerfile
index 13c33d471..6fa0a4537 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,13 +49,23 @@ ENV LANG="en_US.UTF-8" \
     PROFILING_EXTENSION_HTTP_KEY=dev \
     PROFILING_EXTENSION_HTTP_IP_WHITELIST=127.0.0.1
 
-
 # START Operations as `azuracast` user
 USER azuracast
 
-RUN touch /var/azuracast/.docker
 WORKDIR /var/azuracast/www
 
+COPY --chown=azuracast:azuracast ./composer.json ./composer.lock ./
+RUN composer install \
+    --no-dev \
+    --no-ansi \
+    --no-autoloader \
+    --no-interaction
+
+COPY --chown=azuracast:azuracast . .
+
+RUN composer dump-autoload --optimize --classmap-authoritative \
+    && touch /var/azuracast/.docker
+
 # END Operations as `azuracast` user
 USER root
 
@@ -114,23 +124,6 @@ COPY --from=build_liquidsoap --chown=azuracast:azuracast /var/azuracast/.opam/oc
 
 RUN ln -s /var/azuracast/.opam/ocaml-system.4.08.1/bin/liquidsoap /usr/local/bin/liquidsoap
 
-# START Operations as `azuracast` user
-USER azuracast
-
-COPY --chown=azuracast:azuracast ./composer.json ./composer.lock ./
-RUN composer install \
-    --no-dev \
-    --no-ansi \
-    --no-autoloader \
-    --no-interaction
-
-COPY --chown=azuracast:azuracast . .
-
-RUN composer dump-autoload --optimize --classmap-authoritative
-
-# END Operations as `azuracast` user
-USER root
-
 # Include radio services in PATH
 ENV PATH="${PATH}:/var/azuracast/servers/shoutcast2"
 
diff --git a/composer.json b/composer.json
index 7a9af18a3..cc0b25215 100644
--- a/composer.json
+++ b/composer.json
@@ -133,10 +133,6 @@
         "phpcbf": "phpcbf",
         "codeception": "codecept run --no-interaction --coverage --coverage-xml --fail-fast",
         "codeception-no-coverage": "codecept run --no-interaction",
-        "ci-test": [
-            "@composer install --no-interaction",
-            "@codeception-no-coverage"
-        ],
         "ci-import-locales": [
             "bin/console locale:import"
         ]