diff --git a/.travis.yml b/.travis.yml
index 33eadef02..e9507d745 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,7 @@ install:
   - pip install boto3
   - pip install troposphere
   - printf '[defaults]\nroles_path=../' >ansible.cfg
-  - ansible-galaxy install -p ../ fiunchinho.wimpy,feature/decouple_role
-  - ansible-galaxy install -p ../ fiunchinho.wimpy.build
+  - ansible-galaxy install -p ../ -r deploy/requirements.yml
 
 script:
   - ./mvnw package
diff --git a/deploy/deploy.yml b/deploy/deploy.yml
index a8d86f069..e5679eca0 100644
--- a/deploy/deploy.yml
+++ b/deploy/deploy.yml
@@ -18,4 +18,4 @@
       healthy_threshold: 3
   roles:
     - role: wimpy.build
-    - role: fiunchinho.wimpy
+    - role: wimpy.deploy
diff --git a/deploy/requirements.yml b/deploy/requirements.yml
new file mode 100644
index 000000000..be33c1c95
--- /dev/null
+++ b/deploy/requirements.yml
@@ -0,0 +1,6 @@
+- src: https://github.com/fiunchinho/wimpy.build
+  name: wimpy.build
+
+- src: https://github.com/fiunchinho/wimpy
+  version: feature/decouple_role
+  name: wimpy.deploy