diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3ab7ef6ae347114d7418a287551a0e2f68890f6..a55f37a3c368cb0a6dfc996c23c9935cedf014ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,82 +1,74 @@
-variables:
-  PREFIX: henrietta/
-  WWWPATH: /var/www/html/dev/vagrant
 
 .job_template: &box_build_job
   stage: build
+  before_script:
+    - python make.py
+    - cp *.sh $BOX/
+    - cp SkeletonVagrantfile $BOX/Vagrantfile
   tags:
     - vagrant
     - develop19216822423
-  before_script:
-    - ln -s .. $BOX/boxen
-    - cp -f *.sh $BOX/
-    - cp SkeletonVagrantfile $BOX/Vagrantfile
-    - sed -ie 's/INSERTBOXNAME/$BOX/g' $BOX/Vagrantfile
-    - cd $BOX; vagrant up
-    - echo "\nwait\n" >> $BOX/build.sh
   script:
     - vagrant up
     - vagrant package --out $BOX.box
     - mv -f $BOX.box /var/www/html/dev/vagrant/$BOX.box
     - vagrant box remove $PREFIX/$BOX
-    - vagrant box add $PREFIX/$BOX file://$WWWPATH/$BOX.box
+    - vagrant box add $PREFIX/$BOX file:///var/www/html/dev/vagrant/$BOX.box
     - cd ..
   after_script:
     - vagrant destroy -f
-    - rm $BOX/boxen
 
 
+build_.git:
+  <<: *box_build_job
+  variables:
+    BOX: .git
+    PREFIX: henrietta/
+  only:
+    - master
+    - /^.git\-(.*)$/
 
 build_cassandra:
   <<: *box_build_job
   variables:
     BOX: cassandra
+    PREFIX: henrietta/
   only:
     - master
     - /^cassandra\-(.*)$/
 
-
 build_cass_zk_rmq:
   <<: *box_build_job
   variables:
     BOX: cass_zk_rmq
+    PREFIX: henrietta/
   only:
     - master
     - /^cass_zk_rmq\-(.*)$/
 
-
 build_czr_pythons:
   <<: *box_build_job
   variables:
     BOX: czr_pythons
+    PREFIX: henrietta/
   only:
     - master
     - /^czr_pythons\-(.*)$/
 
-
-build_czr_pythons_pg:
-  <<: *box_build_job
-  variables:
-    BOX: czr_pythons_pg
-  only:
-    - master
-    - /^czr_pythons_pg\-(.*)$/
-
-
 build_nodejs4:
   <<: *box_build_job
   variables:
     BOX: nodejs4
+    PREFIX: henrietta/
   only:
     - master
     - /^nodejs4\-(.*)$/
 
-
 build_nodejs5_jdk_adk25:
   <<: *box_build_job
   variables:
     BOX: nodejs5_jdk_adk25
+    PREFIX: henrietta/
   only:
     - master
     - /^nodejs5_jdk_adk25\-(.*)$/
-
diff --git a/make.py b/make.py
index 1a640aca81f914e9727cceb6a294e30d6f270818..b2936e1d57a7da406e06fd1d07d2025ebcf9a1c6 100644
--- a/make.py
+++ b/make.py
@@ -6,13 +6,11 @@ import os.path
 
 if __name__ == '__main__':
     dirs = [dir for dir in os.listdir('.') if os.path.isdir(dir)]
-    boxes = [box for box in dirs if os.path.exists(os.path.join(box, 'Vagrantfile'))]
+    boxes = [box for box in dirs if os.path.exists(os.path.join(box, 'DESCRIPTION'))]
 
     # Generate Gitlab CI file
     with open('.gitlab-ci.yml', 'wb') as ci:
         ci.write(b'''
-variables:
-  PREFIX: henrietta/
 .job_template: &box_build_job
   stage: build
   before_script:
@@ -40,10 +38,10 @@ build_%s:
   <<: *box_build_job
   variables:
     BOX: %s
+    PREFIX: henrietta/
   only:
     - master
     - /^%s\-(.*)$/
-
 ''' % (box, box, box))
 
 
diff --git a/nodejs5_jdk_adk25/build_as_vagrant.sh b/nodejs5_jdk_adk25/build_as_vagrant.sh
index e91e95d3153b7d7ca979bfa02098f2bb4704713b..5fa6e8e03b52ccf02aab66b3ba88d69446a4f7f2 100644
--- a/nodejs5_jdk_adk25/build_as_vagrant.sh
+++ b/nodejs5_jdk_adk25/build_as_vagrant.sh
@@ -17,30 +17,10 @@ npm install -g --unsafe-perm bower gulp cordova@6.3.1 karma) &
  unzip tools_r25.2.3-linux.zip &&
  rm -f tools_r25.2.3-linux.zip) &
 
-wget -nv http://dev.dms-serwis.com.pl/misc/jdk-8u121-linux-x64.tar.gz
-tar xzf jdk-8u121-linux-x64.tar.gz
-rm -f jdk-8u121-linux-x64.tar.gz
-update-alternatives --install /usr/bin/java java /home/vagrant/jdk1.8.0_121/bin/java 100
-update-alternatives --install /usr/bin/javac javac /home/vagrant/jdk1.8.0_121/bin/javac 100
-update-alternatives --install /usr/bin/jar jar /home/vagrant/jdk1.8.0_121/bin/jar 100
-update-alternatives --install /usr/bin/jarsigner jarsigner /home/vagrant/jdk1.8.0_121/bin/jarsigner 100
+bash wynurz.sh jdk
 
 wait %2
 
 echo y | ./tools/bin/sdkmanager "build-tools;25.0.1" "build-tools;24.0.0" "platforms;android-25" "platforms;android-24" "platforms;android-23" "platform-tools" "extras;android;m2repository" "extras;google;m2repository" "extras;google;google_play_services"
 
 wait %1
-
-(npm cache clean &&
-) $
-
-$(bash wynurz.sh jdk &&
-bash wynurz.sh adt) $
-
-
-
-
-    echo y | ./tools/bin/sdkmanager "build-tools;25.0.1" "build-tools;24.0.0" "platforms;android-25" "platforms;android-24" "platforms;android-23" "platform-tools" "extras;android;m2repository" "extras;google;m2repository" "extras;google;google_play_services"
-
-
-
diff --git a/wynurz.sh b/wynurz.sh
index d72cb65aaefd6d58dd4fb2553e038c97d6f84ac4..d6cf4b2746a045678548819c30e073efd5c7b751 100644
--- a/wynurz.sh
+++ b/wynurz.sh
@@ -30,11 +30,13 @@ if [ $1 == "node5" ]; then
 fi
 
 if [ $1 == "jdk" ]; then
-    cd /home/vagrant
-
-    rm -f jdk-8u121-linux-x64.tar.gz
-
-
+    sudo wget -nv http://dev.dms-serwis.com.pl/misc/jdk-8u121-linux-x64.tar.gz
+    sudo tar xzf jdk-8u121-linux-x64.tar.gz
+    sudo rm -f jdk-8u121-linux-x64.tar.gz
+    sudo update-alternatives --install /usr/bin/java java /home/vagrant/jdk1.8.0_121/bin/java 100
+    sudo update-alternatives --install /usr/bin/javac javac /home/vagrant/jdk1.8.0_121/bin/javac 100
+    sudo update-alternatives --install /usr/bin/jar jar /home/vagrant/jdk1.8.0_121/bin/jar 100
+    sudo update-alternatives --install /usr/bin/jarsigner jarsigner /home/vagrant/jdk1.8.0_121/bin/jarsigner 100
 fi