diff --git a/.teamcity/OpenSourceProjects_Storybook/Project.kt b/.teamcity/OpenSourceProjects_Storybook/Project.kt
index 3d029d749e7..c230b3c6fab 100644
--- a/.teamcity/OpenSourceProjects_Storybook/Project.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/Project.kt
@@ -45,6 +45,24 @@ object Project : Project({
             settingsFormat = VersionedSettings.Format.KOTLIN
             storeSecureParamsOutsideOfVcs = true
         }
+        feature {
+            type = "buildtype-graphs"
+            id = "PROJECT_EXT_132"
+            param("series", """
+                    [
+                      {
+                        "type": "valueType",
+                        "title": "Build Duration (all stages)",
+                        "key": "BuildDuration"
+                      }
+                    ]
+                """.trimIndent())
+            param("format", "duration")
+            param("hideFilters", "")
+            param("title", "Build Duration")
+            param("defaultFilters", "")
+            param("seriesTitle", "Serie")
+        }
         feature {
             id = "PROJECT_EXT_259"
             type = "IssueTracker"
diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt
index 22b6cc3b7ef..b0f70ec6bed 100644
--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt
@@ -43,6 +43,7 @@ object OpenSourceProjects_Storybook_Examples : BuildType({
                 set -e -x
                 
                 cd examples/official-storybook
+                rm -rf storybook-static
                 yarn build-storybook
             """.trimIndent()
             dockerImage = "node:latest"
@@ -99,6 +100,7 @@ object OpenSourceProjects_Storybook_Examples : BuildType({
             }
 
             artifacts {
+                cleanDestination = true
                 artifactRules = "cra.zip!** => examples/cra-kitchen-sink/storybook-static"
             }
         }
@@ -108,6 +110,7 @@ object OpenSourceProjects_Storybook_Examples : BuildType({
             }
 
             artifacts {
+                cleanDestination = true
                 artifactRules = "vue.zip!** => examples/vue-kitchen-sink/storybook-static"
             }
         }
@@ -117,6 +120,7 @@ object OpenSourceProjects_Storybook_Examples : BuildType({
             }
 
             artifacts {
+                cleanDestination = true
                 artifactRules = "angular.zip!** => examples/angular-cli/storybook-static"
             }
         }
@@ -126,6 +130,7 @@ object OpenSourceProjects_Storybook_Examples : BuildType({
             }
 
             artifacts {
+                cleanDestination = true
                 artifactRules = "polymer.zip!** => examples/polymer-cli/storybook-static"
             }
         }
@@ -135,6 +140,7 @@ object OpenSourceProjects_Storybook_Examples : BuildType({
             }
 
             artifacts {
+                cleanDestination = true
                 artifactRules = "mithril.zip!** => examples/mithril-kitchen-sink/storybook-static"
             }
         }
diff --git a/.teamcity/OpenSourceProjects_Storybook/patches/buildTypes/8cc5f747-4ca7-4f0d-940d-b0c422f501a6.kts b/.teamcity/OpenSourceProjects_Storybook/patches/buildTypes/8cc5f747-4ca7-4f0d-940d-b0c422f501a6.kts
deleted file mode 100644
index 5a557f1792c..00000000000
--- a/.teamcity/OpenSourceProjects_Storybook/patches/buildTypes/8cc5f747-4ca7-4f0d-940d-b0c422f501a6.kts
+++ /dev/null
@@ -1,171 +0,0 @@
-package OpenSourceProjects_Storybook.patches.buildTypes
-
-import jetbrains.buildServer.configs.kotlin.v2017_2.*
-import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.ScriptBuildStep
-import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
-import jetbrains.buildServer.configs.kotlin.v2017_2.ui.*
-
-/*
-This patch script was generated by TeamCity on settings change in UI.
-To apply the patch, change the buildType with uuid = '8cc5f747-4ca7-4f0d-940d-b0c422f501a6' (id = 'OpenSourceProjects_Storybook_Examples')
-accordingly and delete the patch script.
-*/
-changeBuildType("8cc5f747-4ca7-4f0d-940d-b0c422f501a6") {
-    expectSteps {
-        script {
-            name = "Bootstrap"
-            scriptContent = """
-                yarn
-                yarn bootstrap --core
-            """.trimIndent()
-            dockerImage = "node:latest"
-        }
-        script {
-            name = "official-storybook"
-            scriptContent = """
-                #!/bin/sh
-                
-                set -e -x
-                
-                cd examples/official-storybook
-                yarn build-storybook
-            """.trimIndent()
-            dockerImage = "node:latest"
-        }
-        script {
-            name = "Image storyshots"
-            scriptContent = """
-                #!/bin/sh
-                
-                set -e -x
-                
-                # Workaround for https://github.com/GoogleChrome/puppeteer/issues/290
-                
-                apt-get update
-                apt-get install -yq gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
-                  libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
-                  libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 \
-                  libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
-                  ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
-                yarn test --image --teamcity
-            """.trimIndent()
-            dockerImage = "node:8"
-        }
-    }
-    steps {
-        update<ScriptBuildStep>(1) {
-            scriptContent = """
-                #!/bin/sh
-                
-                set -e -x
-                
-                cd examples/official-storybook
-                rm -rf storybook-static
-                yarn build-storybook
-            """.trimIndent()
-        }
-    }
-
-    dependencies {
-        expect("OpenSourceProjects_Storybook_CRA") {
-            snapshot {
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
-            artifacts {
-                artifactRules = "cra.zip!** => examples/cra-kitchen-sink/storybook-static"
-            }
-        }
-        update("OpenSourceProjects_Storybook_CRA") {
-            snapshot {
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
-            artifacts {
-                cleanDestination = true
-                artifactRules = "cra.zip!** => examples/cra-kitchen-sink/storybook-static"
-            }
-        }
-
-        expect("OpenSourceProjects_Storybook_Vue") {
-            snapshot {
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
-            artifacts {
-                artifactRules = "vue.zip!** => examples/vue-kitchen-sink/storybook-static"
-            }
-        }
-        update("OpenSourceProjects_Storybook_Vue") {
-            snapshot {
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
-            artifacts {
-                cleanDestination = true
-                artifactRules = "vue.zip!** => examples/vue-kitchen-sink/storybook-static"
-            }
-        }
-
-        expect("OpenSourceProjects_Storybook_Angular") {
-            snapshot {
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
-            artifacts {
-                artifactRules = "angular.zip!** => examples/angular-cli/storybook-static"
-            }
-        }
-        update("OpenSourceProjects_Storybook_Angular") {
-            snapshot {
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
-            artifacts {
-                cleanDestination = true
-                artifactRules = "angular.zip!** => examples/angular-cli/storybook-static"
-            }
-        }
-
-        expect("OpenSourceProjects_Storybook_Polymer") {
-            snapshot {
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
-            artifacts {
-                artifactRules = "polymer.zip!** => examples/polymer-cli/storybook-static"
-            }
-        }
-        update("OpenSourceProjects_Storybook_Polymer") {
-            snapshot {
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
-            artifacts {
-                cleanDestination = true
-                artifactRules = "polymer.zip!** => examples/polymer-cli/storybook-static"
-            }
-        }
-
-        expect("OpenSourceProjects_Storybook_Mithril") {
-            snapshot {
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
-            artifacts {
-                artifactRules = "mithril.zip!** => examples/mithril-kitchen-sink/storybook-static"
-            }
-        }
-        update("OpenSourceProjects_Storybook_Mithril") {
-            snapshot {
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
-            artifacts {
-                cleanDestination = true
-                artifactRules = "mithril.zip!** => examples/mithril-kitchen-sink/storybook-static"
-            }
-        }
-
-    }
-}
diff --git a/.teamcity/OpenSourceProjects_Storybook/patches/projects/69382d9b-7791-418a-9ff6-1c83b86ed6b5.kts b/.teamcity/OpenSourceProjects_Storybook/patches/projects/69382d9b-7791-418a-9ff6-1c83b86ed6b5.kts
deleted file mode 100644
index 6c290aca39d..00000000000
--- a/.teamcity/OpenSourceProjects_Storybook/patches/projects/69382d9b-7791-418a-9ff6-1c83b86ed6b5.kts
+++ /dev/null
@@ -1,35 +0,0 @@
-package OpenSourceProjects_Storybook.patches.projects
-
-import jetbrains.buildServer.configs.kotlin.v2017_2.*
-import jetbrains.buildServer.configs.kotlin.v2017_2.Project
-import jetbrains.buildServer.configs.kotlin.v2017_2.ui.*
-
-/*
-This patch script was generated by TeamCity on settings change in UI.
-To apply the patch, change the project with uuid = '69382d9b-7791-418a-9ff6-1c83b86ed6b5' (id = 'OpenSourceProjects_Storybook')
-accordingly and delete the patch script.
-*/
-changeProject("69382d9b-7791-418a-9ff6-1c83b86ed6b5") {
-    features {
-        add {
-            feature {
-                type = "buildtype-graphs"
-                id = "PROJECT_EXT_132"
-                param("series", """
-                    [
-                      {
-                        "type": "valueType",
-                        "title": "Build Duration (all stages)",
-                        "key": "BuildDuration"
-                      }
-                    ]
-                """.trimIndent())
-                param("format", "duration")
-                param("hideFilters", "")
-                param("title", "Build Duration")
-                param("defaultFilters", "")
-                param("seriesTitle", "Serie")
-            }
-        }
-    }
-}