diff --git a/magnum/drivers/swarm_fedora_atomic_v1/template_def.py b/magnum/drivers/swarm_fedora_atomic_v1/template_def.py
index e20db66fe4..de1e541292 100644
--- a/magnum/drivers/swarm_fedora_atomic_v1/template_def.py
+++ b/magnum/drivers/swarm_fedora_atomic_v1/template_def.py
@@ -28,12 +28,10 @@ class SwarmApiAddressOutputMapping(template_def.OutputMapping):
 
         output_value = self.get_output_value(stack)
         if output_value is not None:
-            protocol = 'https'
-            if baymodel.tls_disabled:
-                protocol = 'tcp'
-
+            # Note(rocha): protocol should always be tcp as the docker
+            # command client does not handle https (see bug #1604812).
             params = {
-                'protocol': protocol,
+                'protocol': 'tcp',
                 'address': output_value,
                 'port': DOCKER_PORT,
             }
diff --git a/magnum/tests/unit/drivers/test_template_definition.py b/magnum/tests/unit/drivers/test_template_definition.py
index b2471a7a62..0f20f08244 100644
--- a/magnum/tests/unit/drivers/test_template_definition.py
+++ b/magnum/tests/unit/drivers/test_template_definition.py
@@ -433,7 +433,7 @@ class AtomicK8sTemplateDefinitionTestCase(base.TestCase):
 
     def test_update_swarm_outputs_if_baymodel_is_secure(self):
         address = 'updated_address'
-        protocol = 'https'
+        protocol = 'tcp'
         port = '2376'
         params = {
             'protocol': protocol,