2 files changed, 4 insertions, 4 deletions
diff --git a/lib/leap_cli/commands/deploy.rb b/lib/leap_cli/commands/deploy.rb
index 065a111..d7f5df8 100644
--- a/lib/leap_cli/commands/deploy.rb
+++ b/lib/leap_cli/commands/deploy.rb
@@ -147,7 +147,7 @@ module LeapCli
     def filter_deploy_nodes(filter)
       nodes = manager.filter!(filter)
       if !leapfile.allow_production_deploy
-        nodes = nodes[:production => false]
+        nodes = nodes[:environment => "!production"]
         assert! nodes.any?, "Skipping deploy because @allow_production_deploy is disabled."
       end
       nodes
diff --git a/lib/leap_cli/commands/test.rb b/lib/leap_cli/commands/test.rb
index 80a6333..1da4f6d 100644
--- a/lib/leap_cli/commands/test.rb
+++ b/lib/leap_cli/commands/test.rb
@@ -25,11 +25,11 @@ module LeapCli; module Commands
   def generate_test_client_openvpn_config
     template = read_file! Path.find_file(:test_client_openvpn_template)
 
-    ['production', 'testing', 'local'].each do |tag|
-      vpn_nodes = manager.nodes[:tags => tag][:services => 'openvpn']
+    ['production', 'testing', 'local', 'development'].each do |env|
+      vpn_nodes = manager.nodes[:environment => env][:services => 'openvpn']
       if vpn_nodes.any?
         config = Util.erb_eval(template, binding)
-        write_file! ('test_openvpn_'+tag).to_sym, config
+        write_file! [:test_openvpn_config, env], config
       end
     end
   end