diff --git a/releasenotes/notes/remove-overcloudrc-v3-088643d24a622473.yaml b/releasenotes/notes/remove-overcloudrc-v3-088643d24a622473.yaml
deleted file mode 100644
index 9db1c27fb..000000000
--- a/releasenotes/notes/remove-overcloudrc-v3-088643d24a622473.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-deprecations:
-  - |
-    List deprecations notes here, or remove this section.  All of the list
-    items in this section are combined when the release notes are rendered, so
-    the text needs to be worded so that it does not depend on any information
-    only available in another section, such as the prelude. This may mean
-    repeating some details.
diff --git a/tripleoclient/tests/test_overcloud_credentials.py b/tripleoclient/tests/test_overcloud_credentials.py
index 0e1e1efa4..c0e5b63c9 100644
--- a/tripleoclient/tests/test_overcloud_credentials.py
+++ b/tripleoclient/tests/test_overcloud_credentials.py
@@ -31,6 +31,7 @@ class TestOvercloudCredentials(test_plugin.TestPluginV1):
             output=json.dumps({
                 "result": {
                     "overcloudrc": "OVERCLOUDRC CONTENTS",
+                    "overcloudrc.v3": "OVERCLOUDRC.v3 CONTENTS",
                 }
             })
         )
@@ -48,8 +49,10 @@ class TestOvercloudCredentials(test_plugin.TestPluginV1):
             self.cmd.take_action(parsed_args)
 
         self.assertIn(mock.call('./overcloudrc', 'w'), m.call_args_list)
+        self.assertIn(mock.call('./overcloudrc.v3', 'w'), m.call_args_list)
         mock_chmod.assert_has_calls([
-            mock.call('./overcloudrc', 384)])
+            mock.call('./overcloudrc', 384),
+            mock.call('./overcloudrc.v3', 384)])
 
         self.workflow.action_executions.create.assert_called_once_with(
             'tripleo.deployment.overcloudrc', {'container': 'overcloud'},
@@ -72,10 +75,13 @@ class TestOvercloudCredentials(test_plugin.TestPluginV1):
             self.cmd.take_action(parsed_args)
 
         path = "{}/overcloudrc".format(temp)
+        pathv3 = "{}/overcloudrc.v3".format(temp)
 
         self.assertIn(mock.call(path, 'w'), m.call_args_list)
+        self.assertIn(mock.call(pathv3, 'w'), m.call_args_list)
         mock_chmod.assert_has_calls([
-            mock.call(path, 384)])
+            mock.call(path, 384),
+            mock.call(pathv3, 384)])
 
         self.workflow.action_executions.create.assert_called_once_with(
             'tripleo.deployment.overcloudrc', {'container': 'overcloud'},
diff --git a/tripleoclient/tests/test_utils.py b/tripleoclient/tests/test_utils.py
index 10fce1865..d7ac3bd61 100644
--- a/tripleoclient/tests/test_utils.py
+++ b/tripleoclient/tests/test_utils.py
@@ -212,19 +212,25 @@ class TestCreateOvercloudRC(TestCase):
 
         tempdir = tempfile.mkdtemp()
         rcfile = os.path.join(tempdir, 'teststackrc')
+        rcfile_v3 = os.path.join(tempdir, 'teststackrc.v3')
 
         overcloudrcs = {
-            "overcloudrc": "overcloudrc v3 is the only version",
+            "overcloudrc": "overcloudrc not v3",
+            "overcloudrc.v3": "overcloudrc.v3",
         }
 
         try:
             utils.write_overcloudrc(stack_name, overcloudrcs,
                                     config_directory=tempdir)
             rc = open(rcfile, 'rt').read()
-            self.assertIn('overcloudrc v3', rc)
+            self.assertIn('overcloudrc not v3', rc)
+            rc_v3 = open(rcfile_v3, 'rt').read()
+            self.assertIn('overcloudrc.v3', rc_v3)
         finally:
             if os.path.exists(rcfile):
                 os.unlink(rcfile)
+            if os.path.exists(rcfile_v3):
+                os.unlink(rcfile_v3)
 
             os.rmdir(tempdir)
 
diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py
index ddc2f8a5a..a29dce50f 100644
--- a/tripleoclient/utils.py
+++ b/tripleoclient/utils.py
@@ -53,11 +53,15 @@ def write_overcloudrc(stack_name, overcloudrcs, config_directory='.'):
     """Write the overcloudrc files"""
 
     rcpath = os.path.join(config_directory, '%src' % stack_name)
+    rcv3path = os.path.join(config_directory, '%src.v3' % stack_name)
 
     with open(rcpath, 'w') as rcfile:
         rcfile.write(overcloudrcs['overcloudrc'])
     os.chmod(rcpath, 0o600)
 
+    with open(rcv3path, 'w') as rcv3file:
+        rcv3file.write(overcloudrcs['overcloudrc.v3'])
+    os.chmod(rcv3path, 0o600)
     return os.path.abspath(rcpath)
 
 
diff --git a/tripleoclient/v1/overcloud_credentials.py b/tripleoclient/v1/overcloud_credentials.py
index b1560d4af..dd99ccd6e 100644
--- a/tripleoclient/v1/overcloud_credentials.py
+++ b/tripleoclient/v1/overcloud_credentials.py
@@ -18,7 +18,7 @@ from tripleoclient.workflows import deployment
 
 
 class OvercloudCredentials(command.Command):
-    """Create the overcloudrc file"""
+    """Create the overcloudrc and overcloudrc.v3 files"""
 
     log = logging.getLogger(__name__ + ".OvercloudCredentials")