diff --git a/.storybook/addons.js b/.storybook/addons.js
deleted file mode 100644
index 4e162fa27..000000000
--- a/.storybook/addons.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import '@storybook/addon-knobs/register'
-import '@storybook/addon-actions/register'
diff --git a/.storybook/config.js b/.storybook/config.js
deleted file mode 100644
index 48e3997eb..000000000
--- a/.storybook/config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { configure } from '@storybook/react'
-import '../ui/app/css/index.scss'
-
-const req = require.context('../ui/app/components', true, /\.stories\.js$/)
-
-function loadStories () {
-  require('./decorators')
-  req.keys().forEach((filename) => req(filename))
-}
-
-configure(loadStories, module)
diff --git a/.storybook/main.js b/.storybook/main.js
new file mode 100644
index 000000000..6743d33e4
--- /dev/null
+++ b/.storybook/main.js
@@ -0,0 +1,7 @@
+module.exports = {
+  stories: ['../ui/app/components/**/*.stories.js'],
+  addons: [
+    '@storybook/addon-knobs',
+    '@storybook/addon-actions',
+  ],
+}
diff --git a/.storybook/decorators.js b/.storybook/preview.js
similarity index 100%
rename from .storybook/decorators.js
rename to .storybook/preview.js