diff --git a/environments/dcn-hci.yaml b/environments/dcn-hci.yaml
index d8036b4e66..a479348c03 100644
--- a/environments/dcn-hci.yaml
+++ b/environments/dcn-hci.yaml
@@ -1,3 +1,6 @@
+# DEPRECATED:
+# - Please use dcn-storage.yaml instead of this file.
+# - This file will be removed during the X-cycle.
 # *******************************************************************
 # This file was created automatically by the sample environment
 # generator. Developers should use `tox -e genconfig` to update it.
diff --git a/environments/dcn-storage.yaml b/environments/dcn-storage.yaml
new file mode 100644
index 0000000000..fa7fdefcea
--- /dev/null
+++ b/environments/dcn-storage.yaml
@@ -0,0 +1,53 @@
+# *******************************************************************
+# This file was created automatically by the sample environment
+# generator. Developers should use `tox -e genconfig` to update it.
+# Users are recommended to make changes to a copy of the file instead
+# of the original, if any customizations are needed.
+# *******************************************************************
+# title: Distributed Compute Node with storage
+# description: |
+#   Environment file for deploying a remote site of distributed compute
+#   nodes (DCN) in a separate stack (multi-stack) deployment with storage;
+#   either HCI or with separate storage nodes. It should be used in
+#   combination with environments/ceph-ansible/ceph-ansible.yaml.
+parameter_defaults:
+  # When running Cinder A/A, whether to connect to Etcd via the local IP for the Etcd network. If set to true, the ip on the local node will be used. If set to false, the VIP on the Etcd network will be used instead. Defaults to false.
+  # Type: boolean
+  CinderEtcdLocalConnect: True
+
+  # The Cinder service's storage availability zone.
+  # Type: string
+  CinderStorageAvailabilityZone: dcn
+
+  # The cluster name used for deploying the cinder-volume service in an active-active (A/A) configuration. This configuration requires the Cinder backend drivers support A/A, and the cinder-volume service not be managed by pacemaker. If these criteria are not met then the cluster name must be left blank.
+  # Type: string
+  CinderVolumeCluster: dcn
+
+  # List of enabled Image Import Methods. Valid values in the list are 'glance-direct', 'web-download', or 'copy-image'
+  # Type: comma_delimited_list
+  GlanceEnabledImportMethods: web-download,copy-image
+
+  # Manage the network and related resources (subnets and segments) with either create, update, or delete operations (depending on the stack operation). Does not apply to ports which will always be managed as needed. Defaults to true. For multi-stack use cases where the network related resources have already been managed by a separate stack, this parameter can be set to false.
+  # Type: boolean
+  ManageNetworks: False
+
+  # The availability zone where new Nova compute nodes will be added. If the zone does not already exist, it will be created. If left unset, it will default to the value of the stack name.
+  # Type: string
+  NovaComputeAvailabilityZone: ''
+
+  # Whether instances can attach cinder volumes from a different availability zone.
+  # Type: boolean
+  NovaCrossAZAttach: False
+
+  # Refuse to boot an instance if it would require downloading from glance and uploading to ceph instead of a COW clone.
+  # Type: boolean
+  NovaDisableImageDownloadToRbd: True
+
+resource_registry:
+  OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml
+  OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml
+  OS::TripleO::Services::CinderVolumeEdge: ../deployment/cinder/cinder-volume-container-puppet.yaml
+  OS::TripleO::Services::Etcd: ../deployment/etcd/etcd-container-puppet.yaml
+  OS::TripleO::Services::GlanceApiEdge: ../deployment/glance/glance-api-edge-container-puppet.yaml
+  OS::TripleO::Services::HAproxyEdge: ../deployment/haproxy/haproxy-edge-container-puppet.yaml
+  OS::TripleO::Services::NovaAZConfig: ../deployment/nova/nova-az-config.yaml
diff --git a/releasenotes/notes/dcn-hci-storage-rename-0b1c17dd50f4cc9a.yaml b/releasenotes/notes/dcn-hci-storage-rename-0b1c17dd50f4cc9a.yaml
new file mode 100644
index 0000000000..08ec74a2cd
--- /dev/null
+++ b/releasenotes/notes/dcn-hci-storage-rename-0b1c17dd50f4cc9a.yaml
@@ -0,0 +1,8 @@
+---
+upgrades:
+  - |
+    dcn-hci.yaml has been renamed to dcn-storage.yaml because DCN sites with
+    storage have the option of not using HCI (Hyper-Converged Infrastructure).
+    dcn-hci.yaml is deprecated but will remain in the environments directory
+    for backwards compatibility. dcn-hci.yaml will be removed during the X
+    cycle. dcn-storage should be used in place of dcn-hci.yaml.
\ No newline at end of file
diff --git a/sample-env-generator/dcn.yaml b/sample-env-generator/dcn.yaml
index fc65df87b2..351235a2cd 100644
--- a/sample-env-generator/dcn.yaml
+++ b/sample-env-generator/dcn.yaml
@@ -28,12 +28,13 @@ environments:
       OS::TripleO::Services::HAproxyEdge: ../deployment/haproxy/haproxy-edge-container-puppet.yaml
       OS::TripleO::Services::NovaAZConfig: ../deployment/nova/nova-az-config.yaml
     children:
-      - name: dcn-hci
-        title: Distributed Compute Node HCI
+      - name: dcn-storage
+        title: Distributed Compute Node with storage
         description: |-
-          Environment file for deploying a remote site of HCI distributed compute
-          nodes (DCN) in a separate stack (multi-stack) deployment. It should be
-          used in combination with environments/ceph-ansible/ceph-ansible.yaml.
+          Environment file for deploying a remote site of distributed compute
+          nodes (DCN) in a separate stack (multi-stack) deployment with storage;
+          either HCI or with separate storage nodes. It should be used in
+          combination with environments/ceph-ansible/ceph-ansible.yaml.
         files:
           <<: *dcn_files
           deployment/cinder/cinder-base.yaml: