diff --git a/deployment/puppet/docker/manifests/dockerctl.pp b/deployment/puppet/docker/manifests/dockerctl.pp
index 5292a03c6b..6885f16ddb 100644
--- a/deployment/puppet/docker/manifests/dockerctl.pp
+++ b/deployment/puppet/docker/manifests/dockerctl.pp
@@ -1,41 +1,39 @@
 class docker::dockerctl (
-  $bin_dir    = '/usr/bin',
-  $share_dir  = '/usr/share/dockerctl',
-  $config_dir = '/etc/dockerctl',
+  $bin_dir     = '/usr/bin',
+  $share_dir   = '/usr/share/dockerctl',
+  $config_dir  = '/etc/dockerctl',
+  $profile_dir = '/etc/profile.d',
   $release,
   $production,
 ) {
 
   # Make sure we have needed directories
-  file { "$bin_dir":
-    ensure => directory;
-  }
-  file { "$share_dir":
-    ensure => directory;
-  }
-  file { "$config_dir":
+  file { [$bin_dir, $share_dir, $config_dir, $profile_dir]:
     ensure => directory;
   }
 
   # Deploy files
   file { "$bin_dir/dockerctl":
-    require => File["$bin_dir"],
     mode    => 0755,
     content => template("docker/dockerctl.erb");
   }
+
+  file { "$profile_dir/dockerctl.sh":
+    content => template("docker/dockerctl-alias.sh.erb"),
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0755',
+  }
   file { "$bin_dir/disable-services.sh":
-    require => File["$bin_dir"],
     mode    => 0755,
-    content => template("docker/disable-services.sh.erb");
+    content => template("docker/disable-services.sh.erb")
   }
   file { "$share_dir/functions":
-    require => File["$share_dir"],
     mode    => 0644,
-    content => template("docker/functions.sh.erb");
+    content => template("docker/functions.sh.erb")
   }
   file { "$config_dir/config":
-    require => File["$config_dir"],
     mode    => 0644,
-    content => template("docker/dockerctl_config.erb");
+    content => template("docker/dockerctl_config.erb")
   }
 }
diff --git a/deployment/puppet/docker/templates/dockerctl-alias.sh.erb b/deployment/puppet/docker/templates/dockerctl-alias.sh.erb
new file mode 100644
index 0000000000..74965b7a48
--- /dev/null
+++ b/deployment/puppet/docker/templates/dockerctl-alias.sh.erb
@@ -0,0 +1,2 @@
+alias cobbler='dockerctl shell cobbler cobbler'
+alias mco='dockerctl shell astute mco'