diff --git a/.teamcity/builds/kotlinlang/templates/DockerImageBuilder.kt b/.teamcity/builds/kotlinlang/templates/DockerImageBuilder.kt
index 01c00fec8a0..7205aac40b6 100644
--- a/.teamcity/builds/kotlinlang/templates/DockerImageBuilder.kt
+++ b/.teamcity/builds/kotlinlang/templates/DockerImageBuilder.kt
@@ -34,9 +34,15 @@ object DockerImageBuilder : Template({
       onDependencyCancel = FailureAction.CANCEL
     }
 
-    artifacts(BuildKotlinGrammar) {
-      buildRule = lastPinned("+:*")
-      artifactRules = "grammar.xml"
+    dependency(BuildKotlinGrammar) {
+      snapshot {
+        onDependencyFailure = FailureAction.FAIL_TO_START
+        onDependencyCancel = FailureAction.CANCEL
+      }
+
+      artifacts {
+        artifactRules = "grammar.xml"
+      }
     }
   }
 })
diff --git a/templates/inc/edit-on-github-link.html b/templates/inc/edit-on-github-link.html
index b3595b8691f..92e2f51742b 100644
--- a/templates/inc/edit-on-github-link.html
+++ b/templates/inc/edit-on-github-link.html
@@ -1,7 +1,9 @@
-<a href="{{ edit_on_github_url }}"
-   class="page-link-to-github"
-   target="_blank"
-   title="Edit this page on GitHub">
-        <i class="github-icon"></i>
-        <span class="text">Edit Page</span>
-</a>
\ No newline at end of file
+{% if edit_on_github_url %}
+    <a href="{{ edit_on_github_url }}"
+        class="page-link-to-github"
+        target="_blank"
+        title="Edit this page on GitHub">
+            <i class="github-icon"></i>
+            <span class="text">Edit Page</span>
+    </a>
+{% endif %}
\ No newline at end of file