diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4f90fabfcd9d71be297785bee7ca13bb568b6ff..3261735b7c3d5aae9abf58ab669481363de4b2f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,23 @@
 
-deploy_cassandra:
+deploy:
   stage: deploy
   tags:
     - vagrant
     - develop19216822423
   script:
-  - vagrant box remove henrietta//cassandra
-  - vagrant box add henrietta//cassandra file:///var/www/html/dev/vagrant/cassandra.box
+    - vagrant box remove henrietta/cassandra
+    - vagrant box add henrietta/cassandra file:///var/www/html/dev/vagrant/cassandra.box
+    - vagrant box remove henrietta/cass_zk_rmq
+    - vagrant box add henrietta/cass_zk_rmq file:///var/www/html/dev/vagrant/cass_zk_rmq.box
+    - vagrant box remove henrietta/czr_pythons
+    - vagrant box add henrietta/czr_pythons file:///var/www/html/dev/vagrant/czr_pythons.box
+    - vagrant box remove henrietta/czr_pythons_pg
+    - vagrant box add henrietta/czr_pythons_pg file:///var/www/html/dev/vagrant/czr_pythons_pg.box
+    - vagrant box remove henrietta/nodejs4
+    - vagrant box add henrietta/nodejs4 file:///var/www/html/dev/vagrant/nodejs4.box
+    - vagrant box remove henrietta/nodejs5_jdk_adk25
+    - vagrant box add henrietta/nodejs5_jdk_adk25 file:///var/www/html/dev/vagrant/nodejs5_jdk_adk25.box
+
 build_cassandra:
   stage: build
   tags:
@@ -26,14 +37,6 @@ build_cassandra:
     - vagrant destroy -f
     - cd ..
 
-deploy_cass_zk_rmq:
-  stage: deploy
-  tags:
-    - vagrant
-    - develop19216822423
-  script:
-  - vagrant box remove henrietta//cass_zk_rmq
-  - vagrant box add henrietta//cass_zk_rmq file:///var/www/html/dev/vagrant/cass_zk_rmq.box
 build_cass_zk_rmq:
   stage: build
   tags:
@@ -53,14 +56,6 @@ build_cass_zk_rmq:
     - vagrant destroy -f
     - cd ..
 
-deploy_czr_pythons:
-  stage: deploy
-  tags:
-    - vagrant
-    - develop19216822423
-  script:
-  - vagrant box remove henrietta//czr_pythons
-  - vagrant box add henrietta//czr_pythons file:///var/www/html/dev/vagrant/czr_pythons.box
 build_czr_pythons:
   stage: build
   tags:
@@ -80,14 +75,6 @@ build_czr_pythons:
     - vagrant destroy -f
     - cd ..
 
-deploy_czr_pythons_pg:
-  stage: deploy
-  tags:
-    - vagrant
-    - develop19216822423
-  script:
-  - vagrant box remove henrietta//czr_pythons_pg
-  - vagrant box add henrietta//czr_pythons_pg file:///var/www/html/dev/vagrant/czr_pythons_pg.box
 build_czr_pythons_pg:
   stage: build
   tags:
@@ -107,14 +94,6 @@ build_czr_pythons_pg:
     - vagrant destroy -f
     - cd ..
 
-deploy_nodejs4:
-  stage: deploy
-  tags:
-    - vagrant
-    - develop19216822423
-  script:
-  - vagrant box remove henrietta//nodejs4
-  - vagrant box add henrietta//nodejs4 file:///var/www/html/dev/vagrant/nodejs4.box
 build_nodejs4:
   stage: build
   tags:
@@ -134,14 +113,6 @@ build_nodejs4:
     - vagrant destroy -f
     - cd ..
 
-deploy_nodejs5_jdk_adk25:
-  stage: deploy
-  tags:
-    - vagrant
-    - develop19216822423
-  script:
-  - vagrant box remove henrietta//nodejs5_jdk_adk25
-  - vagrant box add henrietta//nodejs5_jdk_adk25 file:///var/www/html/dev/vagrant/nodejs5_jdk_adk25.box
 build_nodejs5_jdk_adk25:
   stage: build
   tags:
diff --git a/make.py b/make.py
index da59fd1ba12e4f8fb3c03f2581bf6e8d793189be..96d38f299fe49102ad19adc2c116f295f7c7eac3 100644
--- a/make.py
+++ b/make.py
@@ -1,5 +1,9 @@
 # coding=UTF-8
-
+"""
+Run when
+ - new boxes are added
+ - their README.md is changed
+"""
 from __future__ import print_function, absolute_import, division
 import os
 import os.path
@@ -15,7 +19,20 @@ if __name__ == '__main__':
     if len(sys.argv) == 1:
         # Generate Gitlab CI file
         with open('.gitlab-ci.yml', 'wb') as ci:
+            ci.write('''
+deploy:
+  stage: deploy
+  tags:
+    - vagrant
+    - develop19216822423
+  script:''')
 
+            for box in boxes:
+                ci.write('''
+    - vagrant box remove $PREFIX$BOX
+    - vagrant box add $PREFIX$BOX file:///var/www/html/dev/vagrant/$BOX.box'''.replace('$BOX', box).replace('$PREFIX', PREFIX))
+
+            ci.write('\n')
             for box in boxes:
                 try:
                     os.unlink(os.path.join(box, 'metadata.json'))
@@ -23,14 +40,6 @@ if __name__ == '__main__':
                     pass
 
                 ci.write('''
-deploy_$BOX:
-  stage: deploy
-  tags:
-    - vagrant
-    - develop19216822423
-  script:
-  - vagrant box remove $PREFIX/$BOX
-  - vagrant box add $PREFIX/$BOX file:///var/www/html/dev/vagrant/$BOX.box
 build_$BOX:
   stage: build
   tags:
@@ -106,7 +115,7 @@ Boxes, after being built, will be automatically available at
             mdout.write('''{
     "description": "$DESCRIPTION",
     "short_description": "$DESCRIPTION",
-    "name": "$PREFIX/$BOX",
+    "name": "$PREFIX$BOX",
     "versions": [{
         "version": "1",
         "status": "active",
@@ -126,7 +135,7 @@ Boxes, after being built, will be automatically available at
 
         readme = readme + '''Use like:
 ```
-config.vm.box = "$PREFIX/$BOX"
+config.vm.box = "$PREFIX$BOX"
 config.vm.box_url = "http://dev.dms-serwis.com.pl/vagrant/$BOX.box"
 ```
 '''.replace('$BOX', box).replace('$PREFIX', PREFIX)