diff --git a/cms/djangoapps/contentstore/__init__.py b/cms/djangoapps/contentstore/__init__.py
index e8dccbbf60..8b13789179 100644
--- a/cms/djangoapps/contentstore/__init__.py
+++ b/cms/djangoapps/contentstore/__init__.py
@@ -1,3 +1 @@
-from xmodule.templates import update_templates
 
-update_templates()
diff --git a/cms/djangoapps/contentstore/management/commands/update_templates.py b/cms/djangoapps/contentstore/management/commands/update_templates.py
new file mode 100644
index 0000000000..b30d30480a
--- /dev/null
+++ b/cms/djangoapps/contentstore/management/commands/update_templates.py
@@ -0,0 +1,9 @@
+from xmodule.templates import update_templates
+from django.core.management.base import BaseCommand
+
+class Command(BaseCommand):
+    help = \
+'''Imports and updates the Studio component templates from the code pack and put in the DB'''
+
+    def handle(self, *args, **options):
+        update_templates()
\ No newline at end of file
diff --git a/rakefile b/rakefile
index 15692d0d99..f62e75507c 100644
--- a/rakefile
+++ b/rakefile
@@ -440,6 +440,13 @@ namespace :cms do
   end
 end
 
+namespace :cms do
+  desc "Imports all the templates from the code pack"
+  task :update_templates do
+    sh(django_admin(:cms, :dev, :update_templates))
+  end
+end
+
 namespace :cms do
   desc "Import course data within the given DATA_DIR variable"
   task :xlint do