diff --git a/classes/system b/classes/system
index 3799d9a..ad28e21 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 3799d9a181bcb6d5d07612a5934dbfc9ed18960e
+Subproject commit ad28e212e503c42a20dd8ca7ebf2daaf22939dba
diff --git a/scripts/infra_install.sh b/scripts/infra_install.sh
index 6166440..de3b853 100755
--- a/scripts/infra_install.sh
+++ b/scripts/infra_install.sh
@@ -12,5 +12,8 @@
 
 sleep 5
 
+# Run for CA generation. CA will be generated right after 'salt.minion' state.
+salt -C 'I@salt:master' state.sls salt.minion.ca
+
 # Bootstrap all nodes
 salt "*" state.sls linux,openssh,salt.minion,ntp,rsyslog