diff --git a/README.rst b/README.rst
index ac06056..ff7a112 100644
--- a/README.rst
+++ b/README.rst
@@ -27,12 +27,15 @@
           metadata:
             address: 10.0.106.10
             port: 8000
+            protocol: http
           waitcondition:
             address: 10.0.106.10
             port: 8000
+            protocol: http
           watch:
             address: 10.0.106.10
             port: 8003
+            protocol: http
         cloudwatch:
           host: 10.0.106.20
         api:
diff --git a/heat/files/liberty/heat.conf.Debian b/heat/files/liberty/heat.conf.Debian
index 68ce5f0..697fdb0 100644
--- a/heat/files/liberty/heat.conf.Debian
+++ b/heat/files/liberty/heat.conf.Debian
@@ -33,13 +33,13 @@
 plugin_dirs={{ server.dir.plugins|join(",") }}
 {%- endif %}
 
-heat_metadata_server_url=http://{{ server.metadata.host }}:{{ server.metadata.port }}
+heat_metadata_server_url={{ server.metadata.protocol }}://{{ server.metadata.host }}:{{ server.metadata.port }}
 
 # URL of the Heat waitcondition server. (string value)
-heat_waitcondition_server_url=http://{{ server.waitcondition.host }}:{{ server.waitcondition.port }}/v1/waitcondition
+heat_waitcondition_server_url={{ server.waitcondition.protocol }}://{{ server.waitcondition.host }}:{{ server.waitcondition.port }}/v1/waitcondition
 
 # URL of the Heat CloudWatch server. (string value)
-heat_watch_server_url=http://{{ server.watch.host }}:{{ server.watch.port }}
+heat_watch_server_url={{ server.watch.protocol }}://{{ server.watch.host }}:{{ server.watch.port }}
 # Format string for %%(asctime)s in log records. Default: %(default)s . (string
 # value)
 #log_date_format = %Y-%m-%d %H:%M:%S
diff --git a/heat/files/mitaka/heat.conf.Debian b/heat/files/mitaka/heat.conf.Debian
index 72856bf..62a9039 100644
--- a/heat/files/mitaka/heat.conf.Debian
+++ b/heat/files/mitaka/heat.conf.Debian
@@ -33,13 +33,13 @@
 plugin_dirs={{ server.dir.plugins|join(",") }}
 {%- endif %}
 
-heat_metadata_server_url=http://{{ server.metadata.host }}:{{ server.metadata.port }}
+heat_metadata_server_url={{ server.metadata.protocol }}://{{ server.metadata.host }}:{{ server.metadata.port }}
 
 # URL of the Heat waitcondition server. (string value)
-heat_waitcondition_server_url=http://{{ server.waitcondition.host }}:{{ server.waitcondition.port }}/v1/waitcondition
+heat_waitcondition_server_url={{ server.waitcondition.protocol }}://{{ server.waitcondition.host }}:{{ server.waitcondition.port }}/v1/waitcondition
 
 # URL of the Heat CloudWatch server. (string value)
-heat_watch_server_url=http://{{ server.watch.host }}:{{ server.watch.port }}
+heat_watch_server_url={{ server.watch.protocol }}://{{ server.watch.host }}:{{ server.watch.port }}
 # Format string for %%(asctime)s in log records. Default: %(default)s . (string
 # value)
 #log_date_format = %Y-%m-%d %H:%M:%S
diff --git a/heat/files/newton/heat.conf.Debian b/heat/files/newton/heat.conf.Debian
index 219e507..9931bab 100644
--- a/heat/files/newton/heat.conf.Debian
+++ b/heat/files/newton/heat.conf.Debian
@@ -33,13 +33,13 @@
 plugin_dirs={{ server.dir.plugins|join(",") }}
 {%- endif %}
 
-heat_metadata_server_url=http://{{ server.metadata.host }}:{{ server.metadata.port }}
+heat_metadata_server_url={{ server.metadata.protocol }}://{{ server.metadata.host }}:{{ server.metadata.port }}
 
 # URL of the Heat waitcondition server. (string value)
-heat_waitcondition_server_url=http://{{ server.waitcondition.host }}:{{ server.waitcondition.port }}/v1/waitcondition
+heat_waitcondition_server_url={{ server.waitcondition.protocol }}://{{ server.waitcondition.host }}:{{ server.waitcondition.port }}/v1/waitcondition
 
 # URL of the Heat CloudWatch server. (string value)
-heat_watch_server_url=http://{{ server.watch.host }}:{{ server.watch.port }}
+heat_watch_server_url={{ server.watch.protocol }}://{{ server.watch.host }}:{{ server.watch.port }}
 # Format string for %%(asctime)s in log records. Default: %(default)s . (string
 # value)
 #log_date_format = %Y-%m-%d %H:%M:%S
diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index a919431..67ddc7f 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -32,12 +32,15 @@
       metadata:
         host: ${_param:cluster_vip_address}
         port: 8000
+        protocol: http
       waitcondition:
         host: ${_param:cluster_vip_address}
         port: 8000
+        protocol: http
       watch:
         host: ${_param:cluster_vip_address}
         port: 8003
+        protocol: http
       identity:
         engine: keystone
         host: ${_param:cluster_vip_address}
diff --git a/metadata/service/server/container.yml b/metadata/service/server/container.yml
index a063428..14b7656 100644
--- a/metadata/service/server/container.yml
+++ b/metadata/service/server/container.yml
@@ -35,12 +35,15 @@
                 metadata:
                   host: 0.0.0.0
                   port: 8000
+                  protocol: http
                 waitcondition:
                   host: 0.0.0.0
                   port: 8000
+                  protocol: http
                 watch:
                   host: 0.0.0.0
                   port: 8003
+                  protocol: http
                 identity:
                   engine: keystone
                   host: ${_param:keystone_service_host}
@@ -56,4 +59,4 @@
                   port: 5672
                   user: openstack
                   password: ${_param:rabbitmq_openstack_password}
-                  virtual_host: '/openstack'
\ No newline at end of file
+                  virtual_host: '/openstack'
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 1f80888..0e60d6a 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -32,12 +32,15 @@
       metadata:
         host: ${_param:single_address}
         port: 8000
+        protocol: http
       waitcondition:
         host: ${_param:single_address}
         port: 8000
+        protocol: http
       watch:
         host: ${_param:single_address}
         port: 8003
+        protocol: http
       identity:
         engine: keystone
         host: ${_param:single_address}