diff --git a/smartgears/smartgears/defaults/main.yml b/smartgears/smartgears/defaults/main.yml
index 89138d57..2dcc7fa4 100644
--- a/smartgears/smartgears/defaults/main.yml
+++ b/smartgears/smartgears/defaults/main.yml
@@ -1,7 +1,6 @@
 ---
 gcube_repository: 'gcube-staging'
-gcube_repository_stagin_test: 'gcube-staging-test'
-
+smartgears_gcube_repository: '{{ gcube_repository }}'
 # Set it to true from the command line when you want to upgrade a
 # distribution version
 smartgears_upgrade: False
@@ -20,7 +19,7 @@ smartgears_install_path: '{{ smartgears_user_home }}/SmartGears'
 smartgears_distribution_version: 2.1.2-4.4.0-146408
 smartgears_file: 'smartgears-distribution-{{ smartgears_distribution_version }}.tar.gz'
 smartgears_global_base_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}'
-smartgears_url: '{{ smartgears_global_base_url }}/org/gcube/distribution/smartgears-distribution/{{ smartgears_distribution_version }}/{{ smartgears_file }}'
+smartgears_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ smartgears_gcube_repository }}/org/gcube/distribution/smartgears-distribution/{{ smartgears_distribution_version }}/{{ smartgears_file }}'
 smartgears_mode: online
 smartgears_application_mode: online
 # Production infra