diff --git a/environments/all-networks-port-security.yaml b/environments/all-networks-port-security.yaml
new file mode 120000
index 0000000..55e2faf
--- /dev/null
+++ b/environments/all-networks-port-security.yaml
@@ -0,0 +1 @@
+all-networks.yaml
\ No newline at end of file
diff --git a/environments/all-networks-public-bond-port-security.yaml b/environments/all-networks-public-bond-port-security.yaml
new file mode 120000
index 0000000..3a632ae
--- /dev/null
+++ b/environments/all-networks-public-bond-port-security.yaml
@@ -0,0 +1 @@
+all-networks-public-bond.yaml
\ No newline at end of file
diff --git a/openstack_virtual_baremetal/deploy.py b/openstack_virtual_baremetal/deploy.py
index 7b2b3fe..ea8912d 100755
--- a/openstack_virtual_baremetal/deploy.py
+++ b/openstack_virtual_baremetal/deploy.py
@@ -190,6 +190,14 @@ def _validate_env(args, env_paths):
             raise RuntimeError('baremetal_prefix ends with role name.  This '
                                'will break build-nodes-json.  Please choose '
                                'a different baremetal_prefix or role name.')
+    for path in env_paths:
+        if 'port-security.yaml' in path:
+            print('WARNING: port-security environment file detected. '
+                  'port-security is now the default. The existing '
+                  'port-security environment files are deprecated and may be '
+                  'removed in the future. Please use the environment files '
+                  'without "port-security" in their filename instead.'
+                  )
 
 
 def _get_heat_client():