diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcfb00eaa4d05fafcdd2468c86832f5c7617db98..2d2a7e5daf72e1bdee2b7e3322922cf170adc5bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,11 @@
-image: docker:19.03.1
+image: docker:19.03.12
 
 variables:
   DOCKER_TLS_CERTDIR: "/certs"
-  IMAGE_TAG: $CI_REGISTRY_IMAGE
-  IMAGE_VER: 1.5.1
+  IMAGE_VER: 1.6.0
 
 services:
-  - docker:19.03.1-dind
+  - docker:19.03.12-dind
 
 before_script:
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -14,7 +13,7 @@ before_script:
 build:
   stage: build
   script:
-    - docker build -t $IMAGE_TAG:$IMAGE_VER .
-    - docker tag $IMAGE_TAG:$IMAGE_VER $IMAGE_TAG:latest
-    - docker push $IMAGE_TAG:$IMAGE_VER
-    - docker push $IMAGE_TAG:latest
+    - docker pull $CI_REGISTRY_IMAGE:latest || true
+    - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$IMAGE_VER --tag $CI_REGISTRY_IMAGE:latest .
+    - docker push $CI_REGISTRY_IMAGE:$IMAGE_VER
+    - docker push $CI_REGISTRY_IMAGE:latest
diff --git a/Dockerfile b/Dockerfile
index 64941fe3e4d3418fa7d07f49251af48b5307102b..4cc0a633e7b7957e2640cbb7ff382b342ad18762 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ RUN apt-get update && apt-get install -y \
     wget \
     cpanminus \
     python \
+    yamdi \
     build-essential \
     libxml2-dev \
     libcrypt-openssl-rsa-perl \
@@ -21,6 +22,7 @@ RUN apt-get update && apt-get install -y \
 RUN cpanm \
     Data::Random \
     DBIx::Class \
+    Media::Info \
     Mojolicious \
     Mojo::Pg \
     Mojo::JWT \
@@ -37,3 +39,4 @@ RUN npm update && npm install && npm run build && rm -rf mode_modules
 USER nobody
 EXPOSE 3000
 CMD hypnotoad -f /opt/PiTube/script/pitube
+#CMD /opt/PiTube/script/pitube daemon