diff --git a/.bazelproject b/.bazelproject
index ed7ce57..ea24aea 100644
--- a/.bazelproject
+++ b/.bazelproject
@@ -17,7 +17,6 @@
   .
 
 targets:
-  -//docs/...
   //:all_local_tests
   //examples/...
   # These targets are built for the ide only. Primary purpose is to ensure the builder can build the targets, but it's
diff --git a/Makefile b/Makefile
index 70b0c47..261925c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,3 @@
 
 proto.regen:
 	scripts/gen_proto_jars
-
-docs.regen:
-	bazel build //docs
-	unzip -o bazel-bin/docs/docs-skydoc.zip -d docs
-
-docs.preview_local:
-	bazel build //docs --define local=1
-	unzip -o bazel-bin/docs/docs-skydoc.zip -d /tmp/rules_kotlin
-	open /tmp/rules_kotlin/index.html
diff --git a/README.md b/README.md
index cb80b20..f27fb74 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,10 @@
 * Mixed-Mode compilation (compile Java and Kotlin in one pass).
 
 # Quick Guide
-Consult the generated [documentation](https://bazelbuild.github.io/rules_kotlin). This section just contains a quick 
-overview. 
+This section just contains a quick overview. Consult the generated 
+[documentation](https://bazelbuild.github.io/rules_kotlin). Note: Skydoc documentation is no longer being generated. 
+Comprehensive documentation will have to wait till the new documentation generation tool is ready. A contribution to 
+port the documentation to the RST format like `rules_go` has would be very welcome !
 
 
 ## WORKSPACE
diff --git a/WORKSPACE b/WORKSPACE
index f77b88a..b6d1c29 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -21,42 +21,22 @@
     repo = "google/protobuf",
 )
 
-github_archive(
+git_repository(
+    name = "bazel_skylib",
+    remote = "https://github.com/bazelbuild/bazel-skylib.git",
+    tag = "0.5.0",
+)
+
+git_repository(
     name = "build_bazel_rules_nodejs",
-    commit = "df3d2f577ec57ef5a622c809288a29545470c15d",
-    repo = "bazelbuild/rules_nodejs",
+    remote = "https://github.com/bazelbuild/rules_nodejs.git",
+    tag = "0.11.4",
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
 
 node_repositories(package_json = [])
 
-github_archive(
-    name = "io_bazel_rules_sass",
-    commit = "38989d69ef3ba5847640f007fee5cc489be6ede9",
-    repo = "bazelbuild/rules_sass",
-)
-
-load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
-
-sass_repositories()
-
-github_archive(
-    name = "bazel_skylib",
-    commit = "3fea8cb680f4a53a129f7ebace1a5a4d1e035914",
-    repo = "bazelbuild/bazel-skylib",
-)
-
-github_archive(
-    name = "io_bazel_skydoc",
-    commit = "f531844d137c7accc44d841c08a2a2a366688571",
-    repo = "bazelbuild/skydoc",
-)
-
-load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories")
-
-skydoc_repositories()
-
 http_jar(
     name = "bazel_deps",
     sha256 = "05498224710808be9687f5b9a906d11dd29ad592020246d4cd1a26eeaed0735e",
diff --git a/docs/BUILD b/docs/BUILD
deleted file mode 100644
index 8943957..0000000
--- a/docs/BUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-load("@bazel_skylib//:skylark_library.bzl", "skylark_library")
-load("@io_bazel_skydoc//skylark:skylark.bzl", "skylark_doc")
-
-skylark_library(
-    name = "doc_public",
-    srcs = ["//kotlin:kotlin.bzl"],
-    visibility = ["//visibility:private"],
-)
-
-skylark_library(
-    name = "doc_toolchains",
-    srcs = ["//kotlin:toolchains.bzl"],
-    visibility = ["//visibility:private"],
-)
-
-skylark_doc(
-    name = "docs",
-    srcs = [
-        ":doc_public",
-        ":doc_toolchains",
-    ],
-    format = "html",
-    site_root = select({
-        ":local": "/tmp/rules_kotlin",
-        "//conditions:default": "https://bazelbuild.github.io/rules_kotlin",
-    }),
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "local",
-    values = {
-        "define": "local=1",
-    },
-)