diff --git a/manifests/compute.pp b/manifests/compute.pp
index f39180a1..5eafbfc7 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -63,7 +63,9 @@ class cloud::compute(
   $rabbit_hosts            = $os_params::rabbit_hosts,
   $rabbit_password         = $os_params::rabbit_password,
   $ks_glance_internal_host = $os_params::ks_glance_internal_host,
-  $glance_api_port         = $os_params::ks_glance_api_internal_port,
+  #TODO(Gonéri) will have to use $os_params::ks_glance_api_internal_port
+  # here in the future
+  $glance_api_port         = $os_params::ks_glance_internal_port,
   $verbose                 = $os_params::verbose,
   $debug                   = $os_params::debug
 ) {
diff --git a/manifests/identity.pp b/manifests/identity.pp
index 9ed71138..d1a9da70 100644
--- a/manifests/identity.pp
+++ b/manifests/identity.pp
@@ -343,7 +343,9 @@ class cloud::identity (
   $ks_glance_password           = $os_params::ks_glance_password,
   $ks_glance_public_host        = $os_params::ks_glance_public_host,
   $ks_glance_public_proto       = $os_params::ks_glance_public_proto,
-  $ks_glance_api_public_port    = $os_params::ks_glance_api_public_port,
+  # TODO(Gonéri) will have to use os_params::ks_glance_api_public_port
+  # here in the future
+  $ks_glance_api_public_port    = $os_params::ks_glance_public_port,
   $ks_heat_admin_host           = $os_params::ks_heat_admin_host,
   $ks_heat_internal_host        = $os_params::ks_heat_internal_host,
   $ks_heat_password             = $os_params::ks_heat_password,
diff --git a/manifests/image.pp b/manifests/image.pp
index 3db9e864..7448dc5b 100644
--- a/manifests/image.pp
+++ b/manifests/image.pp
@@ -66,8 +66,11 @@ class cloud::image(
   $glance_db_password               = $os_params::glance_db_password,
   $ks_keystone_internal_host        = $os_params::ks_keystone_internal_host,
   $ks_glance_internal_host          = $os_params::ks_glance_internal_host,
-  $ks_glance_api_internal_port      = $os_params::ks_glance_api_internal_port,
-  $ks_glance_registry_internal_port = $os_params::ks_glance_registry_internal_port,
+  # TODO(Gonéri) will have to use $os_params::ks_glance_api_internal_port
+  # here in the future
+  $ks_glance_api_internal_port      = $os_params::ks_glance_internal_port,
+  # TODO(Gonéri) will have to use $os_params::ks_glance_registry_internal_port
+  $ks_glance_registry_internal_port = $os_params::ks_glance_internal_port,
   $ks_glance_password               = $os_params::ks_glance_password,
   $rabbit_password                  = $os_params::rabbit_password,
   $rabbit_host                      = $os_params::rabbit_hosts[0],
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 45931777..17431d19 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -41,8 +41,11 @@ class cloud::loadbalancer(
   $ks_cinder_public_port            = $os_params::ks_cinder_public_port,
   $ks_ceilometer_public_port        = $os_params::ks_ceilometer_public_port,
   $ks_ec2_public_port               = $os_params::ks_ec2_public_port,
-  $ks_glance_api_public_port        = $os_params::ks_glance_api_public_port,
-  $ks_glance_registry_internal_port = $os_params::ks_glance_registry_internal_port,
+  # TODO(Gonéri): will have to use os_params::ks_glance_api_public_port
+  # here in the future
+  $ks_glance_api_public_port        = $os_params::ks_glance_public_port,
+  # TODO(Gonéri) will have to use $os_params::ks_glance_registry_internal_port
+  $ks_glance_registry_internal_port = $os_params::ks_glance_internal_port,
   $ks_heat_public_port              = $os_params::ks_heat_public_port,
   $ks_heat_cfn_public_port          = $os_params::ks_heat_cfn_public_port,
   $ks_heat_cloudwatch_public_port   = $os_params::ks_heat_cloudwatch_public_port,