diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index e1cf238..f04e21e 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -670,6 +670,11 @@
 def prepareVenv(repo_url, proxy) {
     def python = new com.mirantis.mk.Python()
     repo_name = "${repo_url}".tokenize("/").last()
+    if (repo_url.tokenize().size() > 1){
+        if (repo_url.tokenize()[1] == '-b'){
+            repo_name = repo_url.tokenize()[0].tokenize("/").last()
+        }
+    }
     sh "rm -rf ${repo_name}"
     withEnv(["HTTPS_PROXY=${proxy}", "HTTP_PROXY=${proxy}", "https_proxy=${proxy}", "http_proxy=${proxy}"]) {
         sh "git clone ${repo_url}"
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 613f666..41ec1d0 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -62,6 +62,11 @@
     if (salt.testTarget(master, 'I@logrotate:server')) {
         salt.enforceState(master, 'I@logrotate:server', 'logrotate')
     }
+
+    // Install and configure auditd
+    if (salt.testTarget(master, 'I@auditd:service')) {
+        salt.enforceState(master, 'I@auditd:service', 'auditd')
+    }
 }
 
 def installFoundationInfraOnTarget(master, target, staticMgmtNet=false) {