diff --git a/charts/placement/.helmignore b/charts/placement/.helmignore
new file mode 100644
index 0000000..b54c347
--- /dev/null
+++ b/charts/placement/.helmignore
@@ -0,0 +1 @@
+values_overrides
diff --git a/charts/placement/Chart.yaml b/charts/placement/Chart.yaml
index fa4c4c2..d24a41a 100644
--- a/charts/placement/Chart.yaml
+++ b/charts/placement/Chart.yaml
@@ -9,4 +9,4 @@
 sources:
 - https://opendev.org/openstack/placement
 - https://opendev.org/openstack/openstack-helm
-version: 0.3.7
+version: 0.3.9
diff --git a/charts/placement/charts/helm-toolkit/Chart.yaml b/charts/placement/charts/helm-toolkit/Chart.yaml
index e6aec81..1ee9758 100644
--- a/charts/placement/charts/helm-toolkit/Chart.yaml
+++ b/charts/placement/charts/helm-toolkit/Chart.yaml
@@ -9,4 +9,4 @@
 sources:
 - https://opendev.org/openstack/openstack-helm-infra
 - https://opendev.org/openstack/openstack-helm
-version: 0.2.54
+version: 0.2.55
diff --git a/charts/placement/charts/helm-toolkit/templates/manifests/_ingress.tpl b/charts/placement/charts/helm-toolkit/templates/manifests/_ingress.tpl
index 4c476b2..972e429 100644
--- a/charts/placement/charts/helm-toolkit/templates/manifests/_ingress.tpl
+++ b/charts/placement/charts/helm-toolkit/templates/manifests/_ingress.tpl
@@ -67,10 +67,10 @@
       metadata:
         name: barbican
         annotations:
-          kubernetes.io/ingress.class: "nginx"
           nginx.ingress.kubernetes.io/rewrite-target: /
 
       spec:
+        ingressClassName: "nginx"
         rules:
           - host: barbican
             http:
@@ -108,10 +108,10 @@
       metadata:
         name: barbican-namespace-fqdn
         annotations:
-          kubernetes.io/ingress.class: "nginx"
           nginx.ingress.kubernetes.io/rewrite-target: /
 
       spec:
+        ingressClassName: "nginx"
         tls:
           - secretName: barbican-tls-public
             hosts:
@@ -133,10 +133,10 @@
       metadata:
         name: barbican-cluster-fqdn
         annotations:
-          kubernetes.io/ingress.class: "nginx-cluster"
           nginx.ingress.kubernetes.io/rewrite-target: /
 
       spec:
+        ingressClassName: "nginx-cluster"
         tls:
           - secretName: barbican-tls-public
             hosts:
@@ -202,10 +202,10 @@
       metadata:
         name: barbican
         annotations:
-          kubernetes.io/ingress.class: "nginx"
           nginx.ingress.kubernetes.io/rewrite-target: /
 
       spec:
+        ingressClassName: "nginx"
         tls:
           - secretName: barbican-tls-public
             hosts:
@@ -302,12 +302,12 @@
       metadata:
         name: barbican
         annotations:
-          kubernetes.io/ingress.class: "nginx"
           cert-manager.io/issuer: ca-issuer
           certmanager.k8s.io/issuer: ca-issuer
           nginx.ingress.kubernetes.io/backend-protocol: https
           nginx.ingress.kubernetes.io/secure-backends: "true"
       spec:
+        ingressClassName: "nginx"
         tls:
           - secretName: barbican-tls-public-certmanager
             hosts:
@@ -404,12 +404,12 @@
       metadata:
         name: barbican
         annotations:
-          kubernetes.io/ingress.class: "nginx"
           cert-manager.io/cluster-issuer: ca-issuer
           certmanager.k8s.io/cluster-issuer: ca-issuer
           nginx.ingress.kubernetes.io/backend-protocol: https
           nginx.ingress.kubernetes.io/secure-backends: "true"
       spec:
+        ingressClassName: "nginx"
         tls:
           - secretName: barbican-tls-public-certmanager
             hosts:
@@ -488,10 +488,10 @@
       metadata:
         name: grafana
         annotations:
-          kubernetes.io/ingress.class: "nginx"
           nginx.ingress.kubernetes.io/rewrite-target: /
 
       spec:
+        ingressClassName: "nginx"
         rules:
           - host: grafana
             http:
@@ -529,10 +529,10 @@
       metadata:
         name: grafana-namespace-fqdn
         annotations:
-          kubernetes.io/ingress.class: "nginx"
           nginx.ingress.kubernetes.io/rewrite-target: /
 
       spec:
+        ingressClassName: "nginx"
         tls:
           - secretName: grafana-tls-public
             hosts:
@@ -565,10 +565,10 @@
       metadata:
         name: grafana-cluster-fqdn
         annotations:
-          kubernetes.io/ingress.class: "nginx-cluster"
           nginx.ingress.kubernetes.io/rewrite-target: /
 
       spec:
+        ingressClassName: "nginx-cluster"
         tls:
           - secretName: grafana-tls-public
             hosts:
@@ -639,7 +639,6 @@
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: {{ index $envAll.Values.network $backendService "ingress" "classes" "namespace" | quote }}
 {{- if $certIssuer }}
     cert-manager.io/{{ $certIssuerType }}: {{ $certIssuer }}
     certmanager.k8s.io/{{ $certIssuerType }}: {{ $certIssuer }}
@@ -650,6 +649,7 @@
 {{- end }}
 {{ toYaml (index $envAll.Values.network $backendService "ingress" "annotations") | indent 4 }}
 spec:
+  ingressClassName: {{ index $envAll.Values.network $backendService "ingress" "classes" "namespace" | quote }}
 {{- $host := index $envAll.Values.endpoints ( $backendServiceType | replace "-" "_" ) "hosts" }}
 {{- if $certIssuer }}
 {{- $secretName := index $envAll.Values.secrets "tls" ( $backendServiceType | replace "-" "_" ) $backendService $endpoint }}
@@ -695,9 +695,9 @@
 metadata:
   name: {{ printf "%s-%s-%s" $ingressName $ingressController "fqdn" }}
   annotations:
-    kubernetes.io/ingress.class: {{ index $envAll.Values.network $backendService "ingress" "classes" $ingressController | quote }}
 {{ toYaml (index $envAll.Values.network $backendService "ingress" "annotations") | indent 4 }}
 spec:
+  ingressClassName: {{ index $envAll.Values.network $backendService "ingress" "classes" $ingressController | quote }}
 {{- $host := index $envAll.Values.endpoints ( $backendServiceType | replace "-" "_" ) "host_fqdn_override" }}
 {{- if hasKey $host $endpoint }}
 {{- $endpointHost := index $host $endpoint }}
diff --git a/charts/placement/requirements.lock b/charts/placement/requirements.lock
index 9824cb6..4593a4a 100644
--- a/charts/placement/requirements.lock
+++ b/charts/placement/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: helm-toolkit
   repository: file://../../openstack-helm-infra/helm-toolkit
-  version: 0.2.54
-digest: sha256:337a0f1ffb3eae591150b305c22293d85fb8c18abec78f56672de4f3ada2faae
-generated: "2023-09-01T14:09:25.657734667Z"
+  version: 0.2.55
+digest: sha256:f25556fa4f0b285a96cbf853e72555c04e65772daf0ffa6b518321e5e249f5ca
+generated: "2023-10-27T21:53:47.434673508Z"
diff --git a/charts/placement/values_overrides/2023.1-ubuntu_focal.yaml b/charts/placement/values_overrides/2023.1-ubuntu_focal.yaml
deleted file mode 100644
index b5804f9..0000000
--- a/charts/placement/values_overrides/2023.1-ubuntu_focal.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-images:
-  pull_policy: IfNotPresent
-  tags:
-    placement: "docker.io/openstackhelm/placement:2023.1-ubuntu_focal"
-    ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
-    ks_service: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
-    ks_endpoints: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
-    db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
-    db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal"
-    placement_db_sync: "docker.io/openstackhelm/placement:2023.1-ubuntu_focal"
-    dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0"
-    image_repo_sync: "docker.io/docker:17.07.0"
-dependencies:
-  static:
-    db_sync:
-      jobs:
-        - placement-db-init
-...
diff --git a/charts/placement/values_overrides/apparmor.yaml b/charts/placement/values_overrides/apparmor.yaml
deleted file mode 100644
index ee883ac..0000000
--- a/charts/placement/values_overrides/apparmor.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-pod:
-  mandatory_access_control:
-    type: apparmor
-    placement-api:
-      placement-api: runtime/default
-      init: runtime/default
-...
diff --git a/charts/placement/values_overrides/netpol.yaml b/charts/placement/values_overrides/netpol.yaml
deleted file mode 100644
index 84557be..0000000
--- a/charts/placement/values_overrides/netpol.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-manifests:
-  network_policy: true
-network_policy:
-  placement:
-    egress:
-      - {}
-    ingress:
-      - from:
-        - podSelector:
-            matchLabels:
-              application: nova
-        ports:
-        - protocol: TCP
-          port: 8778
-        - protocol: TCP
-          port: 80
-        - protocol: TCP
-          port: 8080
-...
diff --git a/charts/placement/values_overrides/tls-offloading.yaml b/charts/placement/values_overrides/tls-offloading.yaml
deleted file mode 100644
index ff97285..0000000
--- a/charts/placement/values_overrides/tls-offloading.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-endpoints:
-  identity:
-    auth:
-      admin:
-        cacert: /etc/ssl/certs/openstack-helm.crt
-      placement:
-        cacert: /etc/ssl/certs/openstack-helm.crt
-
-tls:
-  identity: true
-...
diff --git a/charts/placement/values_overrides/tls.yaml b/charts/placement/values_overrides/tls.yaml
deleted file mode 100644
index 514b660..0000000
--- a/charts/placement/values_overrides/tls.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-network:
-  api:
-    ingress:
-      annotations:
-        nginx.ingress.kubernetes.io/backend-protocol: "https"
-conf:
-  software:
-    apache2:
-      a2enmod:
-        - ssl
-  placement:
-    keystone_authtoken:
-      cafile: /etc/placement/certs/ca.crt
-  wsgi_placement: |
-    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" "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
-      WSGIScriptAlias / /var/www/cgi-bin/placement/placement-api
-      WSGIApplicationGroup %{GLOBAL}
-      WSGIPassAuthorization On
-      <IfVersion >= 2.4>
-        ErrorLogFormat "%{cu}t %M"
-      </IfVersion>
-      ErrorLog /dev/stdout
-      SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
-      CustomLog /dev/stdout combined env=!forwarded
-      CustomLog /dev/stdout proxy env=forwarded
-
-      SSLEngine on
-      SSLCertificateFile      /etc/placement/certs/tls.crt
-      SSLCertificateKeyFile   /etc/placement/certs/tls.key
-      SSLProtocol             all -SSLv3 -TLSv1 -TLSv1.1
-      SSLCipherSuite          ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256
-      SSLHonorCipherOrder     on
-    </VirtualHost>
-    Alias /placement /var/www/cgi-bin/placement/placement-api
-    <Location /placement>
-      SetHandler wsgi-script
-      Options +ExecCGI
-      WSGIProcessGroup placement-api
-      WSGIApplicationGroup %{GLOBAL}
-      WSGIPassAuthorization On
-    </Location>
-endpoints:
-  identity:
-    auth:
-      admin:
-        cacert: /etc/ssl/certs/openstack-helm.crt
-      placement:
-        cacert: /etc/ssl/certs/openstack-helm.crt
-    scheme:
-      default: https
-    port:
-      api:
-        default: 443
-  placement:
-    host_fqdn_override:
-      default:
-        tls:
-          secretName: placement-tls-api
-          issuerRef:
-            name: ca-issuer
-            kind: ClusterIssuer
-    scheme:
-      default: https
-      service: https
-    port:
-      api:
-        public: 443
-manifests:
-  certificates: true
-...
diff --git a/charts/placement/values_overrides/victoria-ubuntu_focal.yaml b/charts/placement/values_overrides/victoria-ubuntu_focal.yaml
deleted file mode 100644
index 55a4693..0000000
--- a/charts/placement/values_overrides/victoria-ubuntu_focal.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-images:
-  pull_policy: IfNotPresent
-  tags:
-    placement: "docker.io/openstackhelm/placement:victoria-ubuntu_focal"
-    ks_user: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
-    ks_service: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
-    ks_endpoints: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
-    db_init: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
-    db_drop: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
-    placement_db_sync: "docker.io/openstackhelm/placement:victoria-ubuntu_focal"
-    dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0"
-    image_repo_sync: "docker.io/docker:17.07.0"
-dependencies:
-  static:
-    db_sync:
-      jobs:
-        - placement-db-init
-...
diff --git a/charts/placement/values_overrides/wallaby-ubuntu_focal.yaml b/charts/placement/values_overrides/wallaby-ubuntu_focal.yaml
deleted file mode 100644
index 47cf660..0000000
--- a/charts/placement/values_overrides/wallaby-ubuntu_focal.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-images:
-  pull_policy: IfNotPresent
-  tags:
-    placement: "docker.io/openstackhelm/placement:wallaby-ubuntu_focal"
-    ks_user: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
-    ks_service: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
-    ks_endpoints: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
-    db_init: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
-    db_drop: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
-    placement_db_sync: "docker.io/openstackhelm/placement:wallaby-ubuntu_focal"
-    dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0"
-    image_repo_sync: "docker.io/docker:17.07.0"
-dependencies:
-  static:
-    db_sync:
-      jobs:
-        - placement-db-init
-...
diff --git a/charts/placement/values_overrides/xena-ubuntu_focal.yaml b/charts/placement/values_overrides/xena-ubuntu_focal.yaml
deleted file mode 100644
index 68baf2c..0000000
--- a/charts/placement/values_overrides/xena-ubuntu_focal.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-images:
-  pull_policy: IfNotPresent
-  tags:
-    placement: "docker.io/openstackhelm/placement:xena-ubuntu_focal"
-    ks_user: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
-    ks_service: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
-    ks_endpoints: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
-    db_init: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
-    db_drop: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
-    placement_db_sync: "docker.io/openstackhelm/placement:xena-ubuntu_focal"
-    dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0"
-    image_repo_sync: "docker.io/docker:17.07.0"
-dependencies:
-  static:
-    db_sync:
-      jobs:
-        - placement-db-init
-...
diff --git a/charts/placement/values_overrides/yoga-ubuntu_focal.yaml b/charts/placement/values_overrides/yoga-ubuntu_focal.yaml
deleted file mode 100644
index 46fdb90..0000000
--- a/charts/placement/values_overrides/yoga-ubuntu_focal.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-images:
-  pull_policy: IfNotPresent
-  tags:
-    placement: "docker.io/openstackhelm/placement:yoga-ubuntu_focal"
-    ks_user: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
-    ks_service: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
-    ks_endpoints: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
-    db_init: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
-    db_drop: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
-    placement_db_sync: "docker.io/openstackhelm/placement:yoga-ubuntu_focal"
-    dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0"
-    image_repo_sync: "docker.io/docker:17.07.0"
-dependencies:
-  static:
-    db_sync:
-      jobs:
-        - placement-db-init
-...
diff --git a/charts/placement/values_overrides/zed-ubuntu_focal.yaml b/charts/placement/values_overrides/zed-ubuntu_focal.yaml
deleted file mode 100644
index 901bc96..0000000
--- a/charts/placement/values_overrides/zed-ubuntu_focal.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-images:
-  pull_policy: IfNotPresent
-  tags:
-    placement: "docker.io/openstackhelm/placement:zed-ubuntu_focal"
-    ks_user: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
-    ks_service: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
-    ks_endpoints: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
-    db_init: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
-    db_drop: "docker.io/openstackhelm/heat:zed-ubuntu_focal"
-    placement_db_sync: "docker.io/openstackhelm/placement:zed-ubuntu_focal"
-    dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0"
-    image_repo_sync: "docker.io/docker:17.07.0"
-dependencies:
-  static:
-    db_sync:
-      jobs:
-        - placement-db-init
-...