diff --git a/all/002-images-ceph.yml b/all/002-images-ceph.yml
index bf1e6b5..3ef45a0 100644
--- a/all/002-images-ceph.yml
+++ b/all/002-images-ceph.yml
@@ -8,4 +8,3 @@ ceph_image_version: "{{ ceph_version }}"
 
 ceph_docker_image: osism/ceph-daemon
 ceph_docker_image_tag: "{{ ceph_image_version }}"
-ceph_docker_tag: "{{ ceph_image_version }}}"
diff --git a/all/099-ceph.yml b/all/099-ceph.yml
index fd457f3..6aa3b5f 100644
--- a/all/099-ceph.yml
+++ b/all/099-ceph.yml
@@ -2,7 +2,6 @@
 ##########################
 # generic
 
-ceph_share_directory: /share
 configure_firewall: false
 containerized_deployment: true
 dashboard_enabled: false
@@ -40,14 +39,11 @@ ceph_min_compat_client_order:
 
 # NOTE(berendt): We use an adapted Ceph image in which always the UID 64045 is used
 ceph_uid: 64045
-bootstrap_dirs_owner: "64045"
-bootstrap_dirs_group: "64045"
 
 ##########################
 # osd
 
 osd_objectstore: bluestore
-osd_scenario: lvm
 
 ##########################
 # group names
diff --git a/all/099-generic.yml b/all/099-generic.yml
index 66ff204..2cb8296 100644
--- a/all/099-generic.yml
+++ b/all/099-generic.yml
@@ -12,7 +12,6 @@ configuration_directory: /opt/configuration
 ##########################
 # docker
 
-docker_configure_storage_driver: true
 docker_storage_driver: overlay2
 docker_compose_install_type: package
 
@@ -23,10 +22,6 @@ docker_compose_install_type: package
 
 apt__enabled: false
 
-# grub
-
-grub_hidden_timeout: false
-
 ##########################
 # timezone
 
@@ -48,7 +43,6 @@ osism_strategy: linear
 ##########################
 # rsyslog
 
-fluentd_host: "{{ rsyslog_fluentd_host }}"
 rsyslog_fluentd_host: "{{ internal_address }}"
 
 ##########################
@@ -59,7 +53,6 @@ falco_configure_repository: true
 lynis_configure_repository: true
 netdata_configure_repository: true
 osquery_configure_repository: true
-sysdig_configure_repository: true
 trivy_configure_repository: true
 zabbix_agent_configure_repository: true
 
diff --git a/all/099-infrastructure.yml b/all/099-infrastructure.yml
index 35defc3..a74154f 100644
--- a/all/099-infrastructure.yml
+++ b/all/099-infrastructure.yml
@@ -1,16 +1,7 @@
 ---
-##########################
-# helper
-
-configure_adminer: false
-configure_phpmyadmin: true
-configure_rally: false
-configure_sshconfig: true
-
 ##########################
 # cephclient
 
-cephclient_cluster_fsid: "{{ ceph_cluster_fsid | default('') }}"
 cephclient_groupname: cephclient
 cephclient_keyring: "{{ lookup('file', '{{ configuration_directory }}/environments/infrastructure/files/ceph/ceph.client.admin.keyring', rstrip=false) | default('', true) }}"
 cephclient_keyring_name: client.admin
@@ -19,7 +10,6 @@ cephclient_keyring_name: client.admin
 # openstackclient
 
 openstackclient_configuration_directory: "{{ configuration_directory }}/environments/openstack"
-opentstackclient_groupname: openstackclient
 
 ##########################
 # substation
diff --git a/all/099-interfaces.yml b/all/099-interfaces.yml
index c7d5c97..65390f6 100644
--- a/all/099-interfaces.yml
+++ b/all/099-interfaces.yml
@@ -19,7 +19,6 @@ tunnel_interface: "{{ network_interface }}"
 network_address_family: "ipv4"
 
 api_address_family: "{{ network_address_family }}"
-bifrost_network_address_family: "{{ network_address_family }}"
 dns_address_family: "{{ network_address_family }}"
 migration_address_family: "{{ api_address_family }}"
 octavia_network_address_family: "{{ api_address_family }}"
diff --git a/all/099-k3s.yml b/all/099-k3s.yml
index a09d671..e3ff68a 100644
--- a/all/099-k3s.yml
+++ b/all/099-k3s.yml
@@ -30,7 +30,6 @@ k3s_monitoring_controller_manage_port: "10257"
 
 # cilium
 cilium_mode: "native"
-cilium_cli: false
 cilium_hubble: false
 cilium_hubble_ui_lb: true
 # Cilium BGP is opt-in: with cilium_bgp: true the MetalLB pool is not deployed
diff --git a/all/099-kolla.yml b/all/099-kolla.yml
index e64ae67..4094a75 100644
--- a/all/099-kolla.yml
+++ b/all/099-kolla.yml
@@ -54,8 +54,6 @@ proxysql_version: 3
 
 network_interface: loopback0
 
-certificates_dir: /share/certificates
-
 kolla_base_distro: ubuntu
 kolla_install_type: source
 
@@ -113,7 +111,6 @@ ironic_agent_files_directory: /share/ironic
 enable_ironic_prometheus_exporter: false
 
 # keystone
-keystone_token_provider: "fernet"
 # NOTE: use authorization code in keystone instead of default upstream
 keystone_federation_oidc_response_type: "code"
 keystone_federation_oidc_forwarded_headers: "X-Forwarded-Proto"
diff --git a/monitoring/000-defaults.yml b/monitoring/000-defaults.yml
index b09e2d4..a3cc90f 100644
--- a/monitoring/000-defaults.yml
+++ b/monitoring/000-defaults.yml
@@ -1,3 +1,3 @@
 ---
-k3s_add_labels_monitoring:
+k3s_add_labels__monitoring:
   - node-role.osism.tech/monitoring-plane=true