diff --git a/.asf.yaml b/.asf.yaml
index b31daf4..d784932 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -1,6 +1,15 @@
 # https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features#Git.asf.yamlfeatures-CustomsubjectlinesforGitHubevents
 
 github:
+  protected_branches:
+    master:
+      required_status_checks:
+        # strict means "Require branches to be up to date before merging".
+        strict: false
+      required_pull_request_reviews:
+        dismiss_stale_reviews: false
+        require_code_owner_reviews: false
+        required_approving_review_count: 1
   description: "Apache Drill is a distributed MPP query layer for self describing data"
   homepage: https://drill.apache.org/
   labels:
@@ -12,7 +21,7 @@
     - hadoop
     - jdbc
     - parquet
-  
+
   features:
     # Enable wiki for documentation
     wiki: true
@@ -32,4 +41,3 @@
     comment_issue: "Re: [I] {title} ({repository})"
     close_issue: "Re: [I] {title} ({repository})"
     catchall: "[GH] {title} ({repository})"
-    
diff --git a/docs/dev/Release.md b/docs/dev/Release.md
index 694eef9..524a46d 100644
--- a/docs/dev/Release.md
+++ b/docs/dev/Release.md
@@ -316,8 +316,8 @@
               https://dist.apache.org/repos/dist/release/drill/drill-1.17.0
 
             svn delete \
-              -m "Deleting drill-1.15.0 to keep only last two versions" \
-              https://dist.apache.org/repos/dist/release/drill/drill-1.15.0
+              -m "Deleting drill-1.17.0 to keep only last two versions" \
+              https://dist.apache.org/repos/dist/release/drill/drill-1.17.0
             ```
         3. Go to the [Apache Maven staging repo](https://repository.apache.org/) and promote the release to the production.
         4. Create branch and tag for this release and update Drill version in master (if used automated scripts, tag will be like this `drill-1.11.0`. Branch should be named as `1.11.0`).
@@ -334,14 +334,14 @@
                 2. Write the blog post and push it out to the Apache Drill website so it can be referenced in the announcement.
                     As an example, may be used [this commit](https://github.com/apache/drill/commit/374f55c619f5b7aea5d5161ea21b6e341a682c3f#diff-dfd4d960a68ac8b9a8d6af52c1bcbe4a).
                 3. Update the data in `_data/version.json` - making sure to either match your release notes url to the one
-                    below (`docs/apache-drill-1-6-0-release-notes`) or update it with the different URL:
+                    below (`docs/apache-drill-1-17-0-release-notes`) or update it with the different URL:
                     ```
                     {
-                      "display_version": "1.6",
-                      "full_version": "1.6.0",
+                      "display_version": "1.17",
+                      "full_version": "1.17.0",
                       "release_date": "February 16, 2016",
-                      "blog_post":"/blog/2016/02/16/drill-1.6-released",
-                      "release_notes": "https://drill.apache.org/docs/apache-drill-1-6-0-release-notes/"
+                      "blog_post":"/blog/2016/02/16/drill-1.17-released",
+                      "release_notes": "https://drill.apache.org/docs/apache-drill-1-17-0-release-notes/"
                     }
                     ```
                     As an example, may be used [this commit](https://github.com/apache/drill/commit/374f55c619f5b7aea5d5161ea21b6e341a682c3f#diff-25d705dfbe4caa6041b61ece80270bc1)
@@ -349,27 +349,21 @@
                     1. Checkout to the release version: `git checkout drill-1.17.0`
                     2. Run the following command to generate Javadocs in `target/site/apidocs` directory:
                         ```
-                        mvn install javadoc:aggregate -DskipTests
+                        mvn javadoc:aggregate
                         ```
-                    3. Checkout to the `gh-pages` branch where sources for site are placed:
-                        ```
-                        git checkout gh-pages
-                        ```
-                    4. Remove JavaDocs for previous version:
-                        ```
-                        rm -rf apidocs
-                        ```
-                    5. Copy new JavaDocs and commit changes:
-                        ```
-                        mv target/site/apidocs .
-                        ```
-                    6. Commit changes with the commit message `Publish JavaDocs for the Apache Drill 1.17.0`
-                5. Instructions how to build and deploy Web site may be found here:
-                    https://github.com/apache/drill-site
-            3. Post the announcement about new release on [Apache Drill Twitter](https://twitter.com/apachedrill]).
-            4. A PMC member needs to update the release date for new release here:
+                    3. Replace /apidocs in your clone of drill-site, here assumed to be at ../drill-site.
+                       ```
+                       rm -rf ../drill-site/apidocs
+                       cp -r target/site/apidocs ../drill-site
+                       ```
+                    4. Commit and push the changes to drill-site with the commit message "Publish JavaDocs for the Apache
+Drill 1.17.0".
+                    5. The website CI will automatically publish changes to http://drill.apache.org but more detailed information is also available at
+https://github.com/apache/drill-site.
+            4. Post the announcement about new release on [Apache Drill Twitter](https://twitter.com/apachedrill]).
+            5. A PMC member needs to update the release date for new release here:
                 https://reporter.apache.org/addrelease.html?drill
-            5. Send the announcement to the `dev@drill.apache.org` and `announce@apache.org` mailing lists.
+            6. Send the announcement to the `dev@drill.apache.org` and `announce@apache.org` mailing lists.
 
                 Example: