diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml
index 266ed33e37..3f80979f25 100644
--- a/barbican/Chart.yaml
+++ b/barbican/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Barbican
 name: barbican
-version: 0.2.16
+version: 0.2.17
 home: https://docs.openstack.org/barbican/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
 sources:
diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml
index fb17b7b8ad..ea6added09 100644
--- a/barbican/templates/deployment-api.yaml
+++ b/barbican/templates/deployment-api.yaml
@@ -74,7 +74,9 @@ spec:
             - name: b-api
               containerPort: {{ tuple "key_manager" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: HTTP
+              path: /
               port: {{ tuple "key_manager" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-tmp
diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index d1d2279dbc..c7a79aa791 100644
--- a/cinder/Chart.yaml
+++ b/cinder/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Cinder
 name: cinder
-version: 0.2.27
+version: 0.2.28
 home: https://docs.openstack.org/cinder/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
 sources:
diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml
index b8d305b615..b3e6be102f 100644
--- a/cinder/templates/deployment-api.yaml
+++ b/cinder/templates/deployment-api.yaml
@@ -95,10 +95,14 @@ spec:
             - name: c-api
               containerPort: {{ tuple "volumev3" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "volumev3" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "volumev3" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           livenessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "volumev3" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "volumev3" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 30
             failureThreshold: 3
diff --git a/designate/Chart.yaml b/designate/Chart.yaml
index d06a53377b..8f3971e1c8 100644
--- a/designate/Chart.yaml
+++ b/designate/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Designate
 name: designate
-version: 0.2.6
+version: 0.2.7
 home: https://docs.openstack.org/designate/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Designate/OpenStack_Project_Designate_vertical.jpg
 sources:
diff --git a/designate/templates/deployment-api.yaml b/designate/templates/deployment-api.yaml
index 03e10f0678..b6680d874c 100644
--- a/designate/templates/deployment-api.yaml
+++ b/designate/templates/deployment-api.yaml
@@ -67,7 +67,9 @@ spec:
             - name: dns-api
               containerPort: {{ tuple "dns" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "dns" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "dns" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: designate-bin
diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index 433ad30f2d..ca89a96756 100644
--- a/glance/Chart.yaml
+++ b/glance/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Glance
 name: glance
-version: 0.3.10
+version: 0.3.11
 home: https://docs.openstack.org/glance/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
 sources:
diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml
index 6ba5041ed0..20a0888b6a 100644
--- a/glance/templates/deployment-api.yaml
+++ b/glance/templates/deployment-api.yaml
@@ -172,10 +172,14 @@ spec:
             - name: g-api
               containerPort: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: HTTP
+              path: /
               port: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           livenessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: HTTP
+              path: /
               port: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           {{- end }}
           volumeMounts:
diff --git a/heat/Chart.yaml b/heat/Chart.yaml
index 9955a19592..691706dd6e 100644
--- a/heat/Chart.yaml
+++ b/heat/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Heat
 name: heat
-version: 0.2.16
+version: 0.2.17
 home: https://docs.openstack.org/heat/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png
 sources:
diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml
index 1ecb544ec2..0bed310b59 100644
--- a/heat/templates/deployment-api.yaml
+++ b/heat/templates/deployment-api.yaml
@@ -80,10 +80,14 @@ spec:
             - name: h-api
               containerPort: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           livenessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 30
           volumeMounts:
diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml
index 7f28095fe8..94ddd0674e 100644
--- a/heat/templates/deployment-cfn.yaml
+++ b/heat/templates/deployment-cfn.yaml
@@ -80,10 +80,14 @@ spec:
             - name: h-cfn
               containerPort: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           livenessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 30
           volumeMounts:
diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml
index d6bc2c79f6..f1f7353507 100644
--- a/heat/templates/deployment-cloudwatch.yaml
+++ b/heat/templates/deployment-cloudwatch.yaml
@@ -74,7 +74,9 @@ spec:
             - name: h-cwh
               containerPort: {{ tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-tmp
diff --git a/heat/values_overrides/tls.yaml b/heat/values_overrides/tls.yaml
index e69fdcdd53..fde0e36fb7 100644
--- a/heat/values_overrides/tls.yaml
+++ b/heat/values_overrides/tls.yaml
@@ -152,6 +152,7 @@ endpoints:
             kind: ClusterIssuer
     scheme:
       default: https
+      service: https
     port:
       api:
         public: 443
@@ -165,6 +166,7 @@ endpoints:
             kind: ClusterIssuer
     scheme:
       default: https
+      service: https
     port:
       api:
         public: 443
diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml
index 033884e3fe..8dccfabb41 100644
--- a/ironic/Chart.yaml
+++ b/ironic/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ironic
 name: ironic
-version: 0.2.6
+version: 0.2.7
 home: https://docs.openstack.org/ironic/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png
 sources:
diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml
index f6468b284e..52dd785ba7 100644
--- a/ironic/templates/deployment-api.yaml
+++ b/ironic/templates/deployment-api.yaml
@@ -114,7 +114,9 @@ spec:
           ports:
             - containerPort: {{ tuple "baremetal" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "baremetal" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "baremetal" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-tmp
diff --git a/masakari/Chart.yaml b/masakari/Chart.yaml
index a70095c1e7..693011cfcf 100644
--- a/masakari/Chart.yaml
+++ b/masakari/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Masakari
 name: masakari
-version: 0.1.5
+version: 0.1.6
 home: https://docs.openstack.org/developer/masakari
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Masakari/OpenStack_Project_masakari_vertical.png
 sources:
diff --git a/masakari/templates/deployment-api.yaml b/masakari/templates/deployment-api.yaml
index ed75c954a4..916f0f4aeb 100644
--- a/masakari/templates/deployment-api.yaml
+++ b/masakari/templates/deployment-api.yaml
@@ -13,12 +13,16 @@ limitations under the License.
 */}}
 
 {{- define "masakariApiLivenessProbeTemplate" }}
-tcpSocket:
+httpGet:
+  scheme: {{ tuple "instance_ha" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+  path: /
   port: {{ tuple "instance_ha" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 
 {{- define "masakariApiReadinessProbeTemplate" }}
-tcpSocket:
+httpGet:
+  scheme: HTTP
+  path: /
   port: {{ tuple "instance_ha" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 
diff --git a/mistral/Chart.yaml b/mistral/Chart.yaml
index 59d2f3e613..4ed1e11af3 100644
--- a/mistral/Chart.yaml
+++ b/mistral/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Mistral
 name: mistral
-version: 0.2.5
+version: 0.2.6
 home: https://docs.openstack.org/mistral/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Mistral/OpenStack_Project_Mistral_vertical.png
 sources:
diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml
index 138e538779..480de5a0d0 100644
--- a/mistral/templates/deployment-api.yaml
+++ b/mistral/templates/deployment-api.yaml
@@ -71,7 +71,9 @@ spec:
             - name: w-api
               containerPort: {{ tuple "workflowv2" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "workflowv2" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "workflowv2" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-tmp
diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index 4ff6edc12b..ca01a6666a 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.2.25
+version: 0.2.26
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml
index d7315d22d0..072ce9b6ee 100644
--- a/neutron/templates/deployment-server.yaml
+++ b/neutron/templates/deployment-server.yaml
@@ -21,7 +21,9 @@ exec:
     - "import requests; requests.get('http://127.0.0.1:{{ tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')"
 initialDelaySeconds: 30
 {{- else }}
-tcpSocket:
+httpGet:
+  scheme: {{ tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+  path: /
   port: {{ tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 {{- end }}
@@ -34,7 +36,9 @@ exec:
     - "import requests; requests.get('http://127.0.0.1:{{ tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')"
 initialDelaySeconds: 30
 {{- else }}
-tcpSocket:
+httpGet:
+  scheme: {{ tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+  path: /
   port: {{ tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 {{- end }}
@@ -120,7 +124,9 @@ spec:
             - name: SHORTNAME
               value: {{ tuple "network" "internal" .  | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: HTTPS
+              path: /
               port: {{ tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           command:
             - /tmp/nginx.sh
diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 58049ae87d..9984311763 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.2.45
+version: 0.2.46
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml
index 9170d69b42..e7039f56c3 100644
--- a/nova/templates/deployment-api-metadata.yaml
+++ b/nova/templates/deployment-api-metadata.yaml
@@ -13,12 +13,16 @@ limitations under the License.
 */}}
 
 {{- define "novaApiMetadataLivenessProbeTemplate" }}
-tcpSocket:
+httpGet:
+  scheme: {{ tuple "compute_metadata" "service" "metadata" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+  path: /
   port: {{ .Values.network.metadata.port }}
 {{- end }}
 
 {{- define "novaApiMetadataReadinessProbeTemplate" }}
-tcpSocket:
+httpGet:
+  scheme: {{ tuple "compute_metadata" "service" "metadata" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+  path: /
   port: {{ .Values.network.metadata.port }}
 {{- end }}
 
diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml
index 980dbed844..4cb6744e0f 100644
--- a/nova/templates/deployment-api-osapi.yaml
+++ b/nova/templates/deployment-api-osapi.yaml
@@ -13,12 +13,16 @@ limitations under the License.
 */}}
 
 {{- define "novaApiOsapiLivenessProbeTemplate" }}
-tcpSocket:
+httpGet:
+  scheme: {{ tuple "compute" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+  path: /
   port: {{ tuple "compute" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 
 {{- define "novaApiOsapiReadinessProbeTemplate" }}
-tcpSocket:
+httpGet:
+  scheme: {{ tuple "compute" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+  path: /
   port: {{ tuple "compute" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 
diff --git a/nova/values_overrides/tls.yaml b/nova/values_overrides/tls.yaml
index a9cafc4770..ef3d438592 100644
--- a/nova/values_overrides/tls.yaml
+++ b/nova/values_overrides/tls.yaml
@@ -24,7 +24,7 @@ conf:
       ThreadLimit         720
     </IfModule>
   wsgi_nova_api: |
-    {{- $portInt := tuple "compute" "internal" "api" $ | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+    {{- $portInt := tuple "compute" "service" "api" $ | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     Listen {{ $portInt }}
     <VirtualHost *:{{ $portInt }}>
       ServerName {{ printf "%s.%s.svc.%s" "nova-api" .Release.Namespace .Values.endpoints.cluster_domain_suffix }}
@@ -50,7 +50,7 @@ conf:
       SSLHonorCipherOrder     on
     </VirtualHost>
   wsgi_nova_metadata: |
-    {{- $portInt := tuple "compute_metadata" "internal" "metadata" $ | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+    {{- $portInt := tuple "compute_metadata" "service" "metadata" $ | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     Listen {{ $portInt }}
     <VirtualHost *:{{ $portInt }}>
       ServerName {{ printf "%s.%s.svc.%s" "nova-metadata" .Release.Namespace .Values.endpoints.cluster_domain_suffix }}
@@ -135,6 +135,7 @@ endpoints:
             kind: ClusterIssuer
     scheme:
       default: 'https'
+      service: 'https'
     port:
       api:
         public: 443
diff --git a/octavia/Chart.yaml b/octavia/Chart.yaml
index d7e3a084ce..8e27d56867 100644
--- a/octavia/Chart.yaml
+++ b/octavia/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Octavia
 name: octavia
-version: 0.2.6
+version: 0.2.7
 home: https://docs.openstack.org/octavia/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Octavia/OpenStack_Project_Octavia_vertical.png
 sources:
diff --git a/octavia/templates/deployment-api.yaml b/octavia/templates/deployment-api.yaml
index 76f0d23fb3..2b4a498f4a 100644
--- a/octavia/templates/deployment-api.yaml
+++ b/octavia/templates/deployment-api.yaml
@@ -72,7 +72,9 @@ spec:
             - name: o-api
               containerPort: {{ tuple "load_balancer" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "load_balancer" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "load_balancer" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-etc-octavia
diff --git a/placement/Chart.yaml b/placement/Chart.yaml
index e2321d2109..6dcb5f2f49 100644
--- a/placement/Chart.yaml
+++ b/placement/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Placement
 name: placement
-version: 0.2.11
+version: 0.2.12
 home: https://docs.openstack.org/placement/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png
 sources:
diff --git a/placement/templates/deployment.yaml b/placement/templates/deployment.yaml
index 81aa5c88fd..1ab24bb517 100644
--- a/placement/templates/deployment.yaml
+++ b/placement/templates/deployment.yaml
@@ -77,13 +77,16 @@ spec:
             - name: p-api
               containerPort: {{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           readinessProbe:
-            # NOTE(portdirect): use tcpSocket check as HTTP will return 401
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 15
             periodSeconds: 10
           livenessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: {{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
+              path: /
               port: {{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 50
             periodSeconds: 10
diff --git a/placement/values_overrides/tls.yaml b/placement/values_overrides/tls.yaml
index adfd3594c0..514b66091e 100644
--- a/placement/values_overrides/tls.yaml
+++ b/placement/values_overrides/tls.yaml
@@ -13,13 +13,13 @@ conf:
     keystone_authtoken:
       cafile: /etc/placement/certs/ca.crt
   wsgi_placement: |
-    Listen 0.0.0.0:{{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+    Listen 0.0.0.0:{{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
     LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
     SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
     CustomLog /dev/stdout combined env=!forwarded
     CustomLog /dev/stdout proxy env=forwarded
-    <VirtualHost *:{{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
+    <VirtualHost *:{{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
       ServerName {{ printf "%s.%s.svc.%s" "placement-api" .Release.Namespace .Values.endpoints.cluster_domain_suffix }}
       WSGIDaemonProcess placement-api processes=4 threads=1 user=placement group=placement display-name=%{GROUP}
       WSGIProcessGroup placement-api
@@ -71,6 +71,7 @@ endpoints:
             kind: ClusterIssuer
     scheme:
       default: https
+      service: https
     port:
       api:
         public: 443
diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml
index 82d7d616c0..24cce3f589 100644
--- a/releasenotes/notes/barbican.yaml
+++ b/releasenotes/notes/barbican.yaml
@@ -20,4 +20,5 @@ barbican:
   - 0.2.14 Add Xena and Yoga values overrides
   - 0.2.15 Added OCI registry authentication
   - 0.2.16 Distinguish between port number of internal endpoint and binding port number
+  - 0.2.17 Use HTTP probe instead of TCP probe
 ...
diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml
index d859e60b12..0ea3470a64 100644
--- a/releasenotes/notes/cinder.yaml
+++ b/releasenotes/notes/cinder.yaml
@@ -44,4 +44,5 @@ cinder:
   - 0.2.25 Remove volumes unrelated with ceph backend from conditional volume list in cinder-volume deployment
   - 0.2.26 Distinguish between port number of internal endpoint and binding port number
   - 0.2.27 Support TLS endpoints
+  - 0.2.28 Use HTTP probe instead of TCP probe
 ...
diff --git a/releasenotes/notes/designate.yaml b/releasenotes/notes/designate.yaml
index 1e6542a7d5..459ac59e3a 100644
--- a/releasenotes/notes/designate.yaml
+++ b/releasenotes/notes/designate.yaml
@@ -10,4 +10,5 @@ designate:
   - 0.2.4 Update default image values to Wallaby
   - 0.2.5 Migrated PodDisruptionBudget resource to policy/v1 API version
   - 0.2.6 Added OCI registry authentication
+  - 0.2.7 Use HTTP probe instead of TCP probe
 ...
diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml
index 19f6fc617e..781d3d3c73 100644
--- a/releasenotes/notes/glance.yaml
+++ b/releasenotes/notes/glance.yaml
@@ -31,4 +31,5 @@ glance:
   - 0.3.8 Added OCI registry authentication
   - 0.3.9 Support TLS endpoints
   - 0.3.10 Distinguish between port number of internal endpoint and binding port number
+  - 0.3.11 Use HTTP probe instead of TCP probe
 ...
diff --git a/releasenotes/notes/heat.yaml b/releasenotes/notes/heat.yaml
index ab77d57c6b..f07ea2b342 100644
--- a/releasenotes/notes/heat.yaml
+++ b/releasenotes/notes/heat.yaml
@@ -23,4 +23,5 @@ heat:
   - 0.2.14 Added OCI registry authentication
   - 0.2.15 Distinguish between port number of internal endpoint and binding port number
   - 0.2.16 Support TLS endpoints
+  - 0.2.17 Use HTTP probe instead of TCP probe
 ...
diff --git a/releasenotes/notes/ironic.yaml b/releasenotes/notes/ironic.yaml
index 0a2c98a676..cdfa34034d 100644
--- a/releasenotes/notes/ironic.yaml
+++ b/releasenotes/notes/ironic.yaml
@@ -10,4 +10,5 @@ ironic:
   - 0.2.4 Update defaults to W release
   - 0.2.5 Migrated PodDisruptionBudget resource to policy/v1 API version
   - 0.2.6 Added OCI registry authentication
+  - 0.2.7 Use HTTP probe instead of TCP probe
 ...
diff --git a/releasenotes/notes/masakari.yaml b/releasenotes/notes/masakari.yaml
index d9156ba7e3..2d0e1988a3 100644
--- a/releasenotes/notes/masakari.yaml
+++ b/releasenotes/notes/masakari.yaml
@@ -6,4 +6,5 @@ masakari:
   - 0.1.3 Mount sudoers file for masakari hostmonitors
   - 0.1.4 Migrated PodDisruptionBudget resource to policy/v1 API version
   - 0.1.5 Added OCI registry authentication
+  - 0.1.6 Use HTTP probe instead of TCP probe
 ...
diff --git a/releasenotes/notes/mistral.yaml b/releasenotes/notes/mistral.yaml
index d59921ce86..134139075b 100644
--- a/releasenotes/notes/mistral.yaml
+++ b/releasenotes/notes/mistral.yaml
@@ -9,4 +9,5 @@ mistral:
   - 0.2.3 Update default imaage values to Wallaby
   - 0.2.4 Migrated PodDisruptionBudget resource to policy/v1 API version
   - 0.2.5 Added OCI registry authentication
+  - 0.2.6 Use HTTP probe instead of TCP probe
 ...
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index 634cb03784..96158c5035 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -39,4 +39,5 @@ neutron:
   - 0.2.23 Add neutron_netns_cleanup_cron release image override, so that the respective release image is used
   - 0.2.24 Added OCI registry authentication
   - 0.2.25 Support TLS endpoints
+  - 0.2.26 Use HTTP probe instead of TCP probe
 ...
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 027612cb7e..8718659c8c 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -66,4 +66,5 @@ nova:
   - 0.2.43 Added OCI registry authentication
   - 0.2.44 Distinguish between port number of internal endpoint and binding port number
   - 0.2.45 Support TLS endpoints for metadata-api
+  - 0.2.46 Use HTTP probe instead of TCP probe
 ...
diff --git a/releasenotes/notes/octavia.yaml b/releasenotes/notes/octavia.yaml
index c8c5669eeb..265f847d07 100644
--- a/releasenotes/notes/octavia.yaml
+++ b/releasenotes/notes/octavia.yaml
@@ -10,4 +10,5 @@ octavia:
   - 0.2.4 Fix transport_url
   - 0.2.5 Migrated PodDisruptionBudget resource to policy/v1 API version
   - 0.2.6 Added OCI registry authentication
+  - 0.2.7 Use HTTP probe instead of TCP probe
 ...
diff --git a/releasenotes/notes/placement.yaml b/releasenotes/notes/placement.yaml
index 4c70f2249b..081a1c6791 100644
--- a/releasenotes/notes/placement.yaml
+++ b/releasenotes/notes/placement.yaml
@@ -20,4 +20,5 @@ placement:
   - 0.2.9 Add Xena and Yoga values overrides
   - 0.2.10 Added OCI registry authentication
   - 0.2.11 Distinguish between port number of internal endpoint and binding port number
+  - 0.2.12 Use HTTP probe instead of TCP probe
 ...