diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 55aa6469ec..7abc5b92e3 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -701,7 +701,10 @@ class AddServerSecurityGroup(command.Command):
             security_group = compute_v2.find_security_group(
                 compute_client, parsed_args.group
             )['name']
-        compute_client.add_security_group_to_server(server, security_group)
+        compute_client.add_security_group_to_server(
+            server,
+            {'name': security_group},
+        )
 
 
 class AddServerVolume(command.ShowOne):
@@ -4039,7 +4042,8 @@ class RemoveServerSecurityGroup(command.Command):
                 compute_client, parsed_args.group
             )['name']
         compute_client.remove_security_group_from_server(
-            server, security_group
+            server,
+            {'name': security_group},
         )
 
 
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 0420bfc17f..67171e2bd4 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -1186,7 +1186,7 @@ class TestServerAddSecurityGroup(compute_fakes.TestComputev2):
             self.server.id, ignore_missing=False
         )
         self.compute_sdk_client.add_security_group_to_server.assert_called_once_with(
-            self.server, 'fake_sg'
+            self.server, {'name': 'fake_sg'}
         )
         mock_find_nova_net_sg.assert_called_once_with(
             self.compute_sdk_client, 'fake_sg'
@@ -1207,7 +1207,7 @@ class TestServerAddSecurityGroup(compute_fakes.TestComputev2):
             self.server.id, ignore_missing=False
         )
         self.compute_sdk_client.add_security_group_to_server.assert_called_once_with(
-            self.server, 'fake_sg'
+            self.server, {'name': 'fake_sg'}
         )
         self.assertIsNone(result)
 
@@ -7394,7 +7394,7 @@ class TestServerRemoveSecurityGroup(TestServer):
             self.server.id, ignore_missing=False
         )
         self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(
-            self.server, 'fake_sg'
+            self.server, {'name': 'fake_sg'}
         )
         mock_find_nova_net_sg.assert_called_once_with(
             self.compute_sdk_client, 'fake_sg'
@@ -7415,7 +7415,7 @@ class TestServerRemoveSecurityGroup(TestServer):
             self.server.id, ignore_missing=False
         )
         self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(
-            self.server, 'fake_sg'
+            self.server, {'name': 'fake_sg'}
         )
         self.assertIsNone(result)