diff --git a/manifests/site.pp b/manifests/site.pp
index 259fba6805..ac3ebd8b54 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -649,7 +649,7 @@ node 'storyboard.openstack.org' {
 # A machine to run Storyboard devel
 # Node-OS: trusty
 node 'storyboard-dev.openstack.org' {
-  class { 'openstack_project::storyboard':
+  class { 'openstack_project::storyboard::dev':
     project_config_repo     => 'https://git.openstack.org/openstack-infra/project-config',
     sysadmins               => hiera('sysadmins', []),
     mysql_host              => hiera('storyboard_db_host', 'localhost'),
@@ -671,6 +671,7 @@ node 'storyboard-dev.openstack.org' {
     ],
     sender_email_address => 'storyboard-dev@storyboard-dev.openstack.org',
   }
+
 }
 
 # A machine to serve static content.
diff --git a/modules/openstack_project/manifests/storyboard/dev.pp b/modules/openstack_project/manifests/storyboard/dev.pp
new file mode 100644
index 0000000000..d82ce6fba8
--- /dev/null
+++ b/modules/openstack_project/manifests/storyboard/dev.pp
@@ -0,0 +1,44 @@
+# == Class: openstack_project::storyboard::dev
+#
+class openstack_project::storyboard::dev(
+  $mysql_host = '',
+  $mysql_password = '',
+  $mysql_user = '',
+  $rabbitmq_user = 'storyboard',
+  $rabbitmq_password,
+  $sysadmins = [],
+  $ssl_cert_file_contents = undef,
+  $ssl_key_file_contents = undef,
+  $ssl_chain_file_contents = undef,
+  $openid_url = 'https://login.launchpad.net/+openid',
+  $project_config_repo = '',
+  $hostname = $::fqdn,
+  $valid_oauth_clients = [$::fqdn],
+  $cors_allowed_origins = ["https://${::fqdn}"],
+  $sender_email_address = undef,
+) {
+
+  class { 'openstack_project::storyboard':
+    project_config_repo     => $project_config_repo,
+    sysadmins               => $sysadmins,
+    mysql_host              => $mysql_host,
+    mysql_user              => $mysql_user,
+    mysql_password          => $mysql_password,
+    rabbitmq_user           => $rabbitmq_user,
+    rabbitmq_password       => $rabbitmq_password,
+    ssl_cert_file_contents  => $ssl_cert_file_contents,
+    ssl_key_file_contents   => $ssl_key_file_contents,
+    ssl_chain_file_contents => $ssl_chain_file_contents,
+    hostname                => $hostname,
+    valid_oauth_clients     => $valid_oauth_clients,
+    cors_allowed_origins    => $cors_allowed_origins,
+    sender_email_address    => $sender_email_address,
+  }
+
+  realize (
+    User::Virtual::Localuser['SotK'],
+    User::Virtual::Localuser['Zara'],
+  )
+
+
+}