diff --git a/Makefile b/Makefile
index dd7e5fb3d9..6ead70828b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ generated_templates =                         \
         undercloud-vm-ironic.yaml             \
         undercloud-vm-ironic-vlan.yaml
 
-# Files included in overcloud-source.yaml via FileInclude
-overcloud_source_deps = nova-compute-instance.yaml
+# Files included in deprecated/overcloud-source.yaml via FileInclude
+overcloud_source_deps = deprecated/nova-compute-instance.yaml
 
 all: $(generated_templates)
 VALIDATE := $(patsubst %,validate-%,$(generated_templates))
@@ -18,8 +18,8 @@ $(VALIDATE):
 # You can define in CONTROLEXTRA one or more additional YAML files to further extend the template, some additions could be:
 # - overcloud-vlan-port.yaml to activate the VLAN auto-assignment from Neutron
 # - nfs-source.yaml to configure Cinder with NFS
-overcloud.yaml: overcloud-source.yaml block-storage.yaml swift-deploy.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml nova-compute-config.yaml $(overcloud_source_deps)
-	python ./tripleo_heat_merge/merge.py --hot --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale controller=$${CONTROLSCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE:-'0'} --scale BlockStorage=$${BLOCKSTORAGESCALE:-'0'} --scale CephStorage=$${CEPHSTORAGESCALE:-'0'} overcloud-source.yaml block-storage.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml swift-deploy.yaml nova-compute-config.yaml ${CONTROLEXTRA} > $@.tmp
+overcloud.yaml: deprecated/overcloud-source.yaml deprecated/block-storage.yaml deprecated/swift-deploy.yaml deprecated/swift-source.yaml deprecated/swift-storage-source.yaml deprecated/ssl-source.yaml deprecated/nova-compute-config.yaml $(overcloud_source_deps)
+	python ./tripleo_heat_merge/merge.py --hot --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale controller=$${CONTROLSCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE:-'0'} --scale BlockStorage=$${BLOCKSTORAGESCALE:-'0'} --scale CephStorage=$${CEPHSTORAGESCALE:-'0'} deprecated/overcloud-source.yaml deprecated/block-storage.yaml deprecated/swift-source.yaml deprecated/swift-storage-source.yaml deprecated/ssl-source.yaml deprecated/swift-deploy.yaml deprecated/nova-compute-config.yaml ${CONTROLEXTRA} > $@.tmp
 	mv $@.tmp $@
 
 undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-nova-config.yaml undercloud-vm-nova-deploy.yaml
diff --git a/block-storage.yaml b/deprecated/block-storage.yaml
similarity index 100%
rename from block-storage.yaml
rename to deprecated/block-storage.yaml
diff --git a/nfs-source.yaml b/deprecated/nfs-source.yaml
similarity index 100%
rename from nfs-source.yaml
rename to deprecated/nfs-source.yaml
diff --git a/nova-compute-config.yaml b/deprecated/nova-compute-config.yaml
similarity index 100%
rename from nova-compute-config.yaml
rename to deprecated/nova-compute-config.yaml
diff --git a/nova-compute-instance.yaml b/deprecated/nova-compute-instance.yaml
similarity index 100%
rename from nova-compute-instance.yaml
rename to deprecated/nova-compute-instance.yaml
diff --git a/overcloud-source.yaml b/deprecated/overcloud-source.yaml
similarity index 99%
rename from overcloud-source.yaml
rename to deprecated/overcloud-source.yaml
index f73206d724..91b6b7fd41 100644
--- a/overcloud-source.yaml
+++ b/deprecated/overcloud-source.yaml
@@ -1,5 +1,4 @@
-description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
-  server,Dedicated RabbitMQ Server,Group of Nova Computes
+description: Deprecated. Please migrate to use overcloud-without-mergepy instead.
 heat_template_version: 2013-05-23
 parameters:
   AdminPassword:
@@ -416,7 +415,7 @@ resources:
         get_param: RabbitCookieSalt
   NovaCompute0Deployment:
     type: FileInclude
-    Path: nova-compute-instance.yaml
+    Path: deprecated/nova-compute-instance.yaml
     SubKey: resources.NovaCompute0Deployment
     parameters:
         DefaultSignalTransport:
@@ -456,23 +455,23 @@ resources:
             get_param: NeutronL3HA
   NovaCompute0AllNodesDeployment:
     type: FileInclude
-    Path: nova-compute-instance.yaml
+    Path: deprecated/nova-compute-instance.yaml
     SubKey: resources.NovaCompute0AllNodesDeployment
     parameters:
         AllNodesConfig: {get_resource: allNodesConfig}
   NovaCompute0:
     type: FileInclude
-    Path: nova-compute-instance.yaml
+    Path: deprecated/nova-compute-instance.yaml
     SubKey: resources.NovaCompute0
   NovaCompute0Passthrough:
     type: FileInclude
-    Path: nova-compute-instance.yaml
+    Path: deprecated/nova-compute-instance.yaml
     SubKey: resources.NovaCompute0Passthrough
     parameters:
         passthrough_config: {get_param: ExtraConfig}
   NovaCompute0PassthroughSpecific:
     type: FileInclude
-    Path: nova-compute-instance.yaml
+    Path: deprecated/nova-compute-instance.yaml
     SubKey: resources.NovaCompute0PassthroughSpecific
     parameters:
         passthrough_config_specific: {get_param: NovaComputeExtraConfig}
diff --git a/overcloud-vlan-port.yaml b/deprecated/overcloud-vlan-port.yaml
similarity index 100%
rename from overcloud-vlan-port.yaml
rename to deprecated/overcloud-vlan-port.yaml
diff --git a/ssl-source.yaml b/deprecated/ssl-source.yaml
similarity index 100%
rename from ssl-source.yaml
rename to deprecated/ssl-source.yaml
diff --git a/swift-deploy.yaml b/deprecated/swift-deploy.yaml
similarity index 100%
rename from swift-deploy.yaml
rename to deprecated/swift-deploy.yaml
diff --git a/swift-source.yaml b/deprecated/swift-source.yaml
similarity index 100%
rename from swift-source.yaml
rename to deprecated/swift-source.yaml
diff --git a/swift-storage-source.yaml b/deprecated/swift-storage-source.yaml
similarity index 100%
rename from swift-storage-source.yaml
rename to deprecated/swift-storage-source.yaml