diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py
index 48943b777..8b4fb6f9f 100644
--- a/tripleoclient/config/undercloud.py
+++ b/tripleoclient/config/undercloud.py
@@ -77,7 +77,7 @@ class UndercloudConfig(StandaloneConfig):
             mistral=False,
             nova=False,
             novajoin=False,
-            swift=True,
+            swift=False,
             tempest=True,
             telemetry=False,
             validations=True,
diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py
index c36407b05..d35bf3233 100644
--- a/tripleoclient/tests/config/test_config_undercloud.py
+++ b/tripleoclient/tests/config/test_config_undercloud.py
@@ -170,7 +170,7 @@ class TestUndercloudConfig(base.TestCase):
                     'enable_nova': False,
                     'enable_novajoin': False,
                     'enable_telemetry': False,
-                    'enable_swift': True,
+                    'enable_swift': False,
                     'enable_tempest': True,
                     'enable_validations': True,
                     'enable_zaqar': False}
diff --git a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py
index a4e8a863e..1078b7996 100644
--- a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py
+++ b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py
@@ -89,13 +89,14 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'services/ironic.yaml',
-             '-e',
+             'services/ironic.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
+             'disable-swift.yaml', '-e',
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/tempest.yaml', '-e',
@@ -163,6 +164,8 @@ class TestUndercloudInstall(TestPluginV1):
              '/usertht/environments/services/'
              'undercloud-remove-novajoin.yaml', '-e',
              '/usertht/environments/'
+             'disable-swift.yaml', '-e',
+             '/usertht/environments/'
              'disable-telemetry.yaml', '-e',
              '/usertht/environments/services/tempest.yaml', '-e',
              '/usertht/environments/public-tls-undercloud.yaml',
@@ -321,13 +324,14 @@ class TestUndercloudInstall(TestPluginV1):
              'environments/services/masquerade-networks.yaml',
              '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'services/ironic.yaml',
-             '-e',
+             'services/ironic.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
+             'disable-swift.yaml', '-e',
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/tempest.yaml', '-e',
@@ -391,13 +395,14 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'services/ironic.yaml',
-             '-e',
+             'services/ironic.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
+             'disable-swift.yaml', '-e',
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/tempest.yaml', '-e',
@@ -457,13 +462,14 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'services/ironic.yaml',
-             '-e',
+             'services/ironic.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
+             'disable-swift.yaml', '-e',
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/tempest.yaml', '-e',
@@ -520,13 +526,14 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'services/ironic.yaml',
-             '-e',
+             'services/ironic.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
+             'disable-swift.yaml', '-e',
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/tempest.yaml', '-e',
@@ -679,6 +686,8 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
+             'disable-swift.yaml', '-e',
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/tempest.yaml', '-e',
@@ -742,13 +751,14 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'services/ironic.yaml',
-             '-e',
+             'services/ironic.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
+             'disable-swift.yaml', '-e',
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/tempest.yaml', '-e',
@@ -811,13 +821,14 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'services/ironic.yaml',
-             '-e',
+             'services/ironic.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
+             'disable-swift.yaml', '-e',
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/tempest.yaml', '-e',
@@ -878,13 +889,14 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'services/ironic.yaml',
-             '-e',
+             'services/ironic.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
+             'disable-swift.yaml', '-e',
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/tempest.yaml', '-e',
@@ -951,13 +963,14 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'podman.yaml', '-e', '/home/stack/foo.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'services/ironic.yaml',
-             '-e',
+             'services/ironic.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic-inspector.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
+             'disable-swift.yaml', '-e',
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'disable-telemetry.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/tempest.yaml', '-e',
diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py
index 193493e72..732ae4d46 100644
--- a/tripleoclient/v1/overcloud_deploy.py
+++ b/tripleoclient/v1/overcloud_deploy.py
@@ -63,7 +63,6 @@ class DeployOvercloud(command.Command):
 
     def _setup_clients(self, parsed_args):
         self.clients = self.app.client_manager
-        self.object_client = self.clients.tripleoclient.object_store
         self.orchestration_client = self.clients.orchestration
         if not parsed_args.deployed_server:
             try:
@@ -117,7 +116,7 @@ class DeployOvercloud(command.Command):
             parameters.update(image_params)
 
         password_params = plan_utils.generate_passwords(
-            self.object_client, self.orchestration_client,
+            None, self.orchestration_client,
             args.stack)
 
         parameters.update(password_params)
@@ -265,7 +264,7 @@ class DeployOvercloud(command.Command):
                 "Checking compatibilities of neutron drivers for {0}".format(
                     stack_name))
             msg = update.check_neutron_mechanism_drivers(
-                env, stack, self.object_client, stack_name)
+                env, stack, None, stack_name)
             if msg:
                 raise oscexc.CommandError(msg)
 
@@ -565,8 +564,6 @@ class DeployOvercloud(command.Command):
         with open(output_path, 'r') as fp:
             parameter_defaults = yaml.safe_load(fp)
 
-        # TODO(sbaker) Remove this call when it is no longer necessary
-        # to write to a swift object
         self._write_user_environment(
             parameter_defaults,
             'baremetal-deployed.yaml',