diff --git a/ceph-mon/Chart.yaml b/ceph-mon/Chart.yaml
index 47b60751b..a607ace13 100644
--- a/ceph-mon/Chart.yaml
+++ b/ceph-mon/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Mon
 name: ceph-mon
-version: 0.1.6
+version: 0.1.7
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-mon/templates/service-mon-discovery.yaml b/ceph-mon/templates/service-mon-discovery.yaml
index 92415ec1f..71066a5aa 100644
--- a/ceph-mon/templates/service-mon-discovery.yaml
+++ b/ceph-mon/templates/service-mon-discovery.yaml
@@ -19,14 +19,6 @@ kind: Service
 apiVersion: v1
 metadata:
   name: {{ tuple "ceph_mon" "discovery" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-  annotations:
-    # In kubernetes 1.6 and beyond, it seems there was a change in behavior
-    # requiring us to tolerate unready endpoints to form a quorum.  I can only
-    # guess at some small timing change causing statefulset+2 to not see the
-    # now ready statefulset+1, and because we do not tolerate unready endpoints
-    # a newly provisioned ceph-mon will most certainly never see itself in the
-    # peer list.  This change allows us to form a quorum reliably everytime
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
   ports:
   - name: mon
@@ -40,4 +32,5 @@ spec:
   selector:
 {{ tuple $envAll "ceph" "mon" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   clusterIP: None
+  publishNotReadyAddresses: true
 {{- end }}
diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml
index 12e4998cd..6163a7083 100644
--- a/mariadb/Chart.yaml
+++ b/mariadb/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v10.2.31
 description: OpenStack-Helm MariaDB
 name: mariadb
-version: 0.2.1
+version: 0.2.2
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/mariadb/templates/service-discovery.yaml b/mariadb/templates/service-discovery.yaml
index cc853cf3e..dec979ef3 100644
--- a/mariadb/templates/service-discovery.yaml
+++ b/mariadb/templates/service-discovery.yaml
@@ -19,8 +19,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ tuple "oslo_db" "discovery" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-  annotations:
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
   ports:
     - name: mysql
@@ -28,6 +26,7 @@ spec:
     - name: wsrep
       port: {{ tuple "oslo_db" "direct" "wsrep" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
   clusterIP: None
+  publishNotReadyAddresses: true
   selector:
 {{ tuple $envAll "mariadb" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 {{- end }}
diff --git a/releasenotes/notes/ceph-mon.yaml b/releasenotes/notes/ceph-mon.yaml
index 98ad41b2e..f2d043c98 100644
--- a/releasenotes/notes/ceph-mon.yaml
+++ b/releasenotes/notes/ceph-mon.yaml
@@ -7,4 +7,5 @@ ceph-mon:
   - 0.1.4 Uplift from Nautilus to Octopus release
   - 0.1.5 Add Ceph CSI plugin
   - 0.1.6 Fix python3 issue for util scripts
+  - 0.1.7 remove deprecated svc annotation tolerate-unready-endpoints
 ...
diff --git a/releasenotes/notes/mariadb.yaml b/releasenotes/notes/mariadb.yaml
index 2e5a3aa27..35a2ee537 100644
--- a/releasenotes/notes/mariadb.yaml
+++ b/releasenotes/notes/mariadb.yaml
@@ -17,4 +17,5 @@ mariadb:
   - 0.1.14 Update mysqld-exporter image to v0.12.1
   - 0.2.0 Uplift mariadb version and ubuntu release
   - 0.2.1 Prevent potential splitbrain issue if cluster is in reboot state
+  - 0.2.2 remove deprecated svc annotation tolerate-unready-endpoints
 ...