diff --git a/modules/storyboard/manifests/application.pp b/modules/storyboard/manifests/application.pp
index ae8efc3738..1e80147067 100644
--- a/modules/storyboard/manifests/application.pp
+++ b/modules/storyboard/manifests/application.pp
@@ -55,7 +55,7 @@ class storyboard::application (
   }
 
   # Configure the StoryBoard API
-  file { '/etc/storyboard.conf':
+  file { '/etc/storyboard/storyboard.conf':
     ensure  => present,
     owner   => $storyboard::params::user,
     group   => $storyboard::params::group,
@@ -115,16 +115,16 @@ class storyboard::application (
 
   # Migrate the database
   exec { 'migrate-storyboard-db':
-    command     => 'storyboard-db-manage --config-file /etc/storyboard.conf upgrade head',
+    command     => 'storyboard-db-manage --config-file /etc/storyboard/storyboard.conf upgrade head',
     path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => [
       Exec['install-storyboard'],
-      File['/etc/storyboard.conf'],
+      File['/etc/storyboard/storyboard.conf'],
     ],
     require     => [
       Class['mysql::python'],
-      File['/etc/storyboard.conf'],
+      File['/etc/storyboard/storyboard.conf'],
     ],
     notify      => Service['httpd'],
   }
diff --git a/modules/storyboard/manifests/load_projects.pp b/modules/storyboard/manifests/load_projects.pp
index 30dd095e41..f9bec3e926 100644
--- a/modules/storyboard/manifests/load_projects.pp
+++ b/modules/storyboard/manifests/load_projects.pp
@@ -47,7 +47,7 @@ class storyboard::load_projects (
   }
 
   exec { 'load-projects-yaml':
-    command     => "storyboard-db-manage --config-file /etc/storyboard.conf load_projects ${project_file_path}",
+    command     => "storyboard-db-manage --config-file /etc/storyboard/storyboard.conf load_projects ${project_file_path}",
     path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => File[$project_file_path],
diff --git a/modules/storyboard/manifests/load_superusers.pp b/modules/storyboard/manifests/load_superusers.pp
index 68a8d32dc0..6c563a2d74 100644
--- a/modules/storyboard/manifests/load_superusers.pp
+++ b/modules/storyboard/manifests/load_superusers.pp
@@ -43,7 +43,7 @@ class storyboard::load_superusers (
   }
 
   exec { 'load-superusers-yaml':
-    command     => "storyboard-db-manage --config-file /etc/storyboard.conf load_superusers ${superuser_file_path}",
+    command     => "storyboard-db-manage --config-file /etc/storyboard/storyboard.conf load_superusers ${superuser_file_path}",
     path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => File[$superuser_file_path],