diff --git a/.travis.yml b/.travis.yml
index b31d0f6211d..1a85e5d4a80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,7 @@ jobs:
     - stage: Lint & Test
       name: Terraform lint
       script: docker run -v $(pwd):/data -t quay.io/coreos/tflint
-    - script: >
-        docker run -t -v $(pwd):/workdir 
-        quay.io/coreos/yamllint --config-data 
-        '{extends: default, rules: {line-length: {level: warning, max: 120}}}' 
-        ./examples/ ./installer/
+    - script: ./hack/yaml-lint.sh
       name: YAML lint
     - script: >
         docker run -v $(pwd):/workdir:ro
diff --git a/hack/yaml-lint.sh b/hack/yaml-lint.sh
new file mode 100755
index 00000000000..a8f144bcb58
--- /dev/null
+++ b/hack/yaml-lint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ "$IS_CONTAINER" != "" ]; then
+  yamllint --config-data "{extends: default, rules: {line-length: {level: warning, max: 120}}}" ./examples/ ./installer/
+else
+  docker run -t --rm -v "$(pwd)":/workdir --env IS_CONTAINER='TRUE' --entrypoint sh quay.io/coreos/yamllint ./hack/yaml-lint.sh
+fi;