diff --git a/ansible/roles/panko/defaults/main.yml b/ansible/roles/panko/defaults/main.yml
deleted file mode 100644
index 21dea27b02..0000000000
--- a/ansible/roles/panko/defaults/main.yml
+++ /dev/null
@@ -1,79 +0,0 @@
----
-project_name: "panko"
-
-panko_services:
-  panko-api:
-    container_name: panko_api
-    group: panko-api
-    enabled: true
-    image: "{{ panko_api_image_full }}"
-    volumes: "{{ panko_api_default_volumes + panko_api_extra_volumes }}"
-    dimensions: "{{ panko_api_dimensions }}"
-    haproxy:
-      panko_api:
-        enabled: "{{ enable_panko }}"
-        mode: "http"
-        external: false
-        port: "{{ panko_api_port }}"
-      panko_api_external:
-        enabled: "{{ enable_panko }}"
-        mode: "http"
-        external: true
-        port: "{{ panko_api_port }}"
-
-
-####################
-# Database
-####################
-panko_database_name: "panko"
-panko_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}panko{% endif %}"
-panko_database_mysql_address: "{{ database_address | put_address_in_context('url') }}:{{ database_port }}"
-
-####################
-# Docker
-####################
-panko_install_type: "{{ kolla_install_type }}"
-panko_tag: "{{ openstack_tag }}"
-
-panko_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ panko_install_type }}-panko-api"
-panko_api_tag: "{{ panko_tag }}"
-panko_api_image_full: "{{ panko_api_image }}:{{ panko_api_tag }}"
-panko_api_dimensions: "{{ default_container_dimensions }}"
-
-panko_api_default_volumes:
-  - "{{ node_config_directory }}/panko-api/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
-  - "kolla_logs:/var/log/kolla/"
-panko_api_extra_volumes: "{{ default_extra_volumes }}"
-
-####################
-# OpenStack
-####################
-panko_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ panko_api_port }}"
-panko_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ panko_api_port }}"
-panko_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ panko_api_port }}"
-
-panko_logging_debug: "{{ openstack_logging_debug }}"
-
-panko_keystone_user: "panko"
-
-openstack_panko_auth: "{{ openstack_auth }}"
-
-####################
-# Keystone
-####################
-panko_ks_services:
-  - name: "panko"
-    type: "event"
-    description: "Panko Service"
-    endpoints:
-      - {'interface': 'admin', 'url': '{{ panko_admin_endpoint }}'}
-      - {'interface': 'internal', 'url': '{{ panko_internal_endpoint }}'}
-      - {'interface': 'public', 'url': '{{ panko_public_endpoint }}'}
-
-panko_ks_users:
-  - project: "service"
-    user: "{{ panko_keystone_user }}"
-    password: "{{ panko_keystone_password }}"
-    role: "admin"
diff --git a/ansible/roles/rally/defaults/main.yml b/ansible/roles/rally/defaults/main.yml
deleted file mode 100644
index 571abf19be..0000000000
--- a/ansible/roles/rally/defaults/main.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-project_name: "rally"
-
-rally_services:
-  rally:
-    container_name: "rally"
-    image: "{{ rally_image_full }}"
-    enabled: true
-    group: "rally"
-    volumes: "{{ rally_default_volumes + rally_extra_volumes }}"
-    dimensions: "{{ rally_dimensions }}"
-
-
-########
-# Docker
-########
-rally_install_type: "{{ kolla_install_type }}"
-rally_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ rally_install_type }}-rally"
-rally_tag: "{{ openstack_tag }}"
-rally_image_full: "{{ rally_image }}:{{ rally_tag }}"
-rally_dimensions: "{{ default_container_dimensions }}"
-
-rally_default_volumes:
-  - "{{ node_config_directory }}/rally/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
-  - "kolla_logs:/var/log/kolla/"
-
-rally_extra_volumes: "{{ default_extra_volumes }}"
-
-####################
-# Database
-####################
-rally_database_name: "rally"
-rally_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}rally{% endif %}"
-rally_database_address: "{{ database_address | put_address_in_context('url') }}:{{ database_port }}"