diff --git a/roles/3scale/defaults/main.yml b/roles/3scale/defaults/main.yml
index c36f8ae..17a2781 100644
--- a/roles/3scale/defaults/main.yml
+++ b/roles/3scale/defaults/main.yml
@@ -1,5 +1,7 @@
 ---
 
+  threescale_apicast_git_repo: https://github.com/3scale/apicast.git
+  threescale_webhooks_git_repo: https://github.com/nmasse-itix/3scale-webhooks-sample.git
   threescale_template: https://raw.githubusercontent.com/3scale/3scale-amp-openshift-templates/2.0.0.GA/amp/amp.yml
   threescale_template_format: YAML
   threescale_project: 3scale
diff --git a/roles/3scale/tasks/oauth-client.yml b/roles/3scale/tasks/oauth-client.yml
index 018c492..928d030 100644
--- a/roles/3scale/tasks/oauth-client.yml
+++ b/roles/3scale/tasks/oauth-client.yml
@@ -22,7 +22,7 @@
     when: deploy_needed
 
   - name: Deploy the OAuth client
-    command: oc new-app -n '{{ threescale_project }}' https://github.com/3scale/apicast.git --name=oauth-client --context-dir=/examples/oauth2/client/ -e GATEWAY='https://{{ apicast_hostname }}'
+    command: oc new-app -n '{{ threescale_project }}' '{{ threescale_apicast_git_repo }}' --name=oauth-client --context-dir=/examples/oauth2/client/ -e GATEWAY='https://{{ apicast_hostname }}'
     when: deploy_needed
 
   - name: Wait for OpenShift to create all objects
diff --git a/roles/3scale/tasks/webhooks.yml b/roles/3scale/tasks/webhooks.yml
index f8f9486..0d84b8e 100644
--- a/roles/3scale/tasks/webhooks.yml
+++ b/roles/3scale/tasks/webhooks.yml
@@ -10,7 +10,7 @@
     tags: status
 
   - name: Deploy the Webhooks service
-    command: oc new-app -n '{{ threescale_project }}' https://github.com/nmasse-itix/3scale-webhooks-sample.git --name=webhooks -e SSO_REALM={{ sso_realm }} -e SSO_HOSTNAME={{ sso_route_name }} -e SSO_SERVICE_USERNAME={{ sso_service_username }} -e SSO_SERVICE_PASSWORD={{ sso_service_password }} -e SSO_CLIENT_ID={{ sso_default_client_id }} -e SHARED_SECRET={{ threescale_webhooks_secret }} -e WEBHOOKS_MODULES=log,sso
+    command: oc new-app -n '{{ threescale_project }}' '{{ threescale_webhooks_git_repo }}' --name=webhooks -e SSO_REALM={{ sso_realm }} -e SSO_HOSTNAME={{ sso_route_name }} -e SSO_SERVICE_USERNAME={{ sso_service_username }} -e SSO_SERVICE_PASSWORD={{ sso_service_password }} -e SSO_CLIENT_ID={{ sso_default_client_id }} -e SHARED_SECRET={{ threescale_webhooks_secret }} -e WEBHOOKS_MODULES=log,sso
     when: deploy_needed
 
   - name: Wait for OpenShift to create all objects