diff --git a/.gitignore b/.gitignore
index 1ebe41f06..cafaf74a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ yarn-debug.log*
 yarn-error.log*
 .yarn-integrity
 .eslintcache
+kubeconfig.yaml
 
 /.github
 
diff --git a/.travis.yml b/.travis.yml
index 747a00143..8359c30be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,8 +47,20 @@ after_failure:
   - chmod +x send.sh
   - ./send.sh failure $WEBHOOK_URL
 
+before_deploy:
+  - openssl aes-256-cbc -K $encrypted_44f54ef0bc46_key -iv $encrypted_44f54ef0bc46_iv -in kubeconfig.yaml.enc -out kubeconfig.yaml -d
+  - curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
+  - chmod +x ./kubectl
+  - sudo mv ./kubectl /usr/local/bin/kubectl
+  - mkdir ${HOME}/.kube
+  - cp kubeconfig.yaml ${HOME}/.kube/config
+
 deploy:
   - provider: script
     script: scripts/docker_push.sh
     on:
       branch: master
+  - provider: script
+    script: scripts/deploy.sh
+    on:
+      branch: master
diff --git a/deployment/.travis.yml b/deployment/.travis.yml
deleted file mode 100644
index b39322894..000000000
--- a/deployment/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-language: generic
-
-before_install:
-- openssl aes-256-cbc -K $encrypted_87342d90efbe_key -iv $encrypted_87342d90efbe_iv
-  -in kubeconfig.yaml.enc -out kubeconfig.yaml -d
-
-install:
-- curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
-- chmod +x ./kubectl
-- sudo mv ./kubectl /usr/local/bin/kubectl
-- mkdir ${HOME}/.kube
-- cp kubeconfig.yaml ${HOME}/.kube/config
-
-script:
-- kubectl get nodes
-
-deploy:
-  provider: script
-  # TODO: fix downtime
-  # instead of deleting all pods, update the deployment and make a rollout
-  # TODO: fix multiple access error on volumes
-  # this happens if more than two pods access a volume
-  script: kubectl --namespace=human-connection delete pods --all
-  on:
-    branch: master
diff --git a/deployment/kubeconfig.yaml.enc b/deployment/kubeconfig.yaml.enc
deleted file mode 100644
index e8db78171..000000000
Binary files a/deployment/kubeconfig.yaml.enc and /dev/null differ
diff --git a/kubeconfig.yaml.enc b/kubeconfig.yaml.enc
new file mode 100644
index 000000000..c231b7585
Binary files /dev/null and b/kubeconfig.yaml.enc differ