diff --git a/dockerfiles/theia/Dockerfile b/dockerfiles/theia/Dockerfile
index 889d0b7e27..c791e87928 100644
--- a/dockerfiles/theia/Dockerfile
+++ b/dockerfiles/theia/Dockerfile
@@ -9,8 +9,9 @@
 #   Red Hat, Inc. - initial API and implementation
 ###
 # Builder Image
-#
-FROM #{INCLUDE:docker/${BUILD_IMAGE_TARGET}/builder-from.dockerfile}
+#yarn
+
+FROM quay.io/eclipse/che-theia-dev:next as builder
 
 WORKDIR ${HOME}
 
diff --git a/plugins/github-auth-plugin/package.json b/plugins/github-auth-plugin/package.json
index 959a22b99f..9de1450fc8 100644
--- a/plugins/github-auth-plugin/package.json
+++ b/plugins/github-auth-plugin/package.json
@@ -14,6 +14,9 @@
       "activationEvents": [
         "*"
       ],
+      "dependencies": {
+        "uuid": "^3.1.0"
+      },
       "devDependencies": {
         "@theia/plugin": "next",
         "@theia/plugin-packager": "latest",
@@ -21,7 +24,7 @@
         "rimraf": "2.6.2",
         "typescript-formatter": "7.2.2",
         "ts-loader": "^4.1.0",
-        "uuid": "^8.0.0"
+        "uuid": "^3.1.0"
       },
       "scripts": {
         "prepare": "yarn run clean && yarn run build",