diff --git a/tripleoclient/config/standalone.py b/tripleoclient/config/standalone.py
index 831bf7fde..35f11932e 100644
--- a/tripleoclient/config/standalone.py
+++ b/tripleoclient/config/standalone.py
@@ -53,9 +53,9 @@ class StandaloneConfig(BaseConfig):
 
     def get_enable_service_opts(self, cinder=False, ironic=False,
                                 ironic_inspector=False, mistral=False,
-                                nova=False, novajoin=False, tempest=False,
-                                telemetry=False, validations=False,
-                                zaqar=False):
+                                nova=False, novajoin=False, swift=False,
+                                tempest=False, telemetry=False,
+                                validations=False, zaqar=False):
         _opts = [
             # service enablement
             cfg.BoolOpt('enable_cinder',
@@ -82,6 +82,11 @@ class StandaloneConfig(BaseConfig):
                         help=_('Whether to install novajoin metadata service '
                                'in the Undercloud.')
                         ),
+            cfg.BoolOpt('enable_swift',
+                        default=swift,
+                        help=_('Whether to install Swift services in the '
+                               'Undercloud.')
+                        ),
             cfg.BoolOpt('enable_tempest',
                         default=tempest,
                         help=_('Whether to install Tempest in the Undercloud.'
diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py
index dac859797..48943b777 100644
--- a/tripleoclient/config/undercloud.py
+++ b/tripleoclient/config/undercloud.py
@@ -77,6 +77,7 @@ class UndercloudConfig(StandaloneConfig):
             mistral=False,
             nova=False,
             novajoin=False,
+            swift=True,
             tempest=True,
             telemetry=False,
             validations=True,
diff --git a/tripleoclient/tests/config/test_config_standalone.py b/tripleoclient/tests/config/test_config_standalone.py
index e1985585b..3f022c38f 100644
--- a/tripleoclient/tests/config/test_config_standalone.py
+++ b/tripleoclient/tests/config/test_config_standalone.py
@@ -51,6 +51,7 @@ class TestStandaloneConfig(base.TestCase):
                     'enable_mistral',
                     'enable_nova',
                     'enable_novajoin',
+                    'enable_swift',
                     'enable_telemetry',
                     'enable_tempest',
                     'enable_validations',
@@ -66,6 +67,7 @@ class TestStandaloneConfig(base.TestCase):
                                                   mistral=True,
                                                   nova=True,
                                                   novajoin=True,
+                                                  swift=True,
                                                   telemetry=True,
                                                   tempest=True,
                                                   validations=True,
@@ -76,6 +78,7 @@ class TestStandaloneConfig(base.TestCase):
                     'enable_mistral',
                     'enable_nova',
                     'enable_novajoin',
+                    'enable_swift',
                     'enable_telemetry',
                     'enable_tempest',
                     'enable_validations',
@@ -100,6 +103,7 @@ class TestStandaloneConfig(base.TestCase):
                     'enable_mistral',
                     'enable_nova',
                     'enable_novajoin',
+                    'enable_swift',
                     'enable_telemetry',
                     'enable_tempest',
                     'enable_validations',
diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py
index 81e62a5ab..c36407b05 100644
--- a/tripleoclient/tests/config/test_config_undercloud.py
+++ b/tripleoclient/tests/config/test_config_undercloud.py
@@ -100,6 +100,7 @@ class TestUndercloudConfig(base.TestCase):
                     'enable_nova',
                     'enable_novajoin',
                     'enable_routed_networks',
+                    'enable_swift',
                     'enable_swift_encryption',
                     'enable_telemetry',
                     'enable_tempest',
@@ -169,6 +170,7 @@ class TestUndercloudConfig(base.TestCase):
                     'enable_nova': False,
                     'enable_novajoin': False,
                     'enable_telemetry': False,
+                    'enable_swift': True,
                     'enable_tempest': True,
                     'enable_validations': True,
                     'enable_zaqar': False}
diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py
index 44d9b805c..335db8970 100644
--- a/tripleoclient/v1/undercloud_config.py
+++ b/tripleoclient/v1/undercloud_config.py
@@ -646,6 +646,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
         deploy_args += ['-e', os.path.join(
             tht_templates, "environments/services/zaqar-swift-backend.yaml")]
 
+    if not CONF.get('enable_swift'):
+        deploy_args += ['-e', os.path.join(
+            tht_templates, "environments/disable-swift.yaml")]
+
     if CONF.get('enable_telemetry'):
         for env_file in TELEMETRY_DOCKER_ENV_YAML:
             deploy_args += ['-e', os.path.join(tht_templates, env_file)]