diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6cc94b38e6bb6873d2d2379a8baca317d18a4dc7..e7ea2f24afb629a07879e8978ee6abcd9f0beb23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,10 +50,9 @@ build_client:
   image: docker:19.03.12
   tags: 
     - docker-privileged
-  services:
-    - docker:19.03.12-dind
   stage: build
   script:
+    - cd app/client
     - docker build -f app/client/Dockerfile -t $CLIENT_IMAGE_TAG .
     - docker tag $CLIENT_IMAGE_TAG $CLIENT_RELEASE_IMAGE_TAG
     - docker push $CLIENT_RELEASE_IMAGE_TAG
diff --git a/app/client/Dockerfile b/app/client/Dockerfile
index 0e6e782312787326f10ed115ba3c3c9a89a217da..8cb3e5cb53b64a82bda6ce28ba0097bd672c0155 100644
--- a/app/client/Dockerfile
+++ b/app/client/Dockerfile
@@ -3,11 +3,15 @@ FROM node:12.16.3 as build
 
 RUN mkdir /usr/src/app
 WORKDIR /usr/src/app
-COPY . ./
+
+COPY package*.json ./
+
 ENV PATH /usr/src/app/node_modules/.bin:$PATH
-RUN ls -a
+
 RUN npm install --silent
 
+COPY . .
+
 RUN npm run build
 
 # Put this stuff into a nginx server