diff --git a/nodes/rsk-testnet-2.json b/nodes/rsk-testnet-2.json
index 5735317..770fb70 100644
--- a/nodes/rsk-testnet-2.json
+++ b/nodes/rsk-testnet-2.json
@@ -32,6 +32,7 @@
       "postfix::_attributes",
       "postfix::sasl_auth",
       "hostname::default",
+      "kosmos_rsk::firewall",
       "firewall::default",
       "chef-sugar::default"
     ],
@@ -52,6 +53,6 @@
   },
   "run_list": [
     "recipe[kosmos-base]",
-    "role[rsk_testnet]"
+    "role[rskj_testnet]"
   ]
-}
\ No newline at end of file
+}
diff --git a/site-cookbooks/kosmos_rsk/recipes/nginx.rb b/site-cookbooks/kosmos_rsk/recipes/nginx.rb
index c4d5c50..242d72f 100644
--- a/site-cookbooks/kosmos_rsk/recipes/nginx.rb
+++ b/site-cookbooks/kosmos_rsk/recipes/nginx.rb
@@ -8,6 +8,8 @@ include_recipe "kosmos-nginx"
 app_name = "rskj"
 domain   = node[app_name]["nginx"]["domain"]
 
+nginx_certbot_site domain
+
 template "#{node['nginx']['dir']}/sites-available/#{domain}" do
   source "nginx_conf_#{app_name}.erb"
   owner 'www-data'
@@ -23,5 +25,3 @@ end
 nginx_site domain do
   action :enable
 end
-
-nginx_certbot_site domain