diff --git a/tools/overrides/mvp/cinder.yaml b/tools/overrides/mvp/cinder.yaml
deleted file mode 100644
index 8c46a5a888..0000000000
--- a/tools/overrides/mvp/cinder.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# MVP values for cinder.
-# This file contains overrides to launch a MVP deployment of cinder for the
-# OpenStack-Helm Single node gates, and local development use. It should be
-# kept to the bare minimum required for this purpose.
-
-storage: "gate"
-
-conf:
-  cinder:
-    DEFAULT:
-      backup_driver: "cinder.backup.drivers.nfs"
-  backends:
-    rbd1:
-      volume_driver: "cinder.volume.drivers.nfs.NfsDriver"
diff --git a/tools/overrides/mvp/nova.yaml b/tools/overrides/mvp/nova.yaml
deleted file mode 100644
index 6025f7133c..0000000000
--- a/tools/overrides/mvp/nova.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ceph:
-  enabled: false
-
-conf:
-  nova:
-    libvirt:
-      images_type: null
-      images_rbd_pool: null
-      images_rbd_ceph_conf: null
-      rbd_user: null
-      rbd_secret_uuid: null
-      disk_cachemodes: null
-      hw_disk_discard: null
-    upgrade_levels:
-      compute: null