diff --git a/packages/builder/src/stores/portal/plugins.js b/packages/builder/src/stores/portal/plugins.js
index a498bf663a..821934307d 100644
--- a/packages/builder/src/stores/portal/plugins.js
+++ b/packages/builder/src/stores/portal/plugins.js
@@ -32,10 +32,12 @@ export function createPluginsStore() {
       case "npm":
         pluginData.npmToken = auth
         break
+      case "github":
+        pluginData.githubToken = auth
+        break
     }
 
     let res = await API.createPlugin(pluginData)
-    console.log("RESP", res)
 
     let newPlugin = res.plugins[0]
     update(state => {
diff --git a/packages/server/src/api/controllers/plugin.ts b/packages/server/src/api/controllers/plugin.ts
index 26caf38806..1159b08dce 100644
--- a/packages/server/src/api/controllers/plugin.ts
+++ b/packages/server/src/api/controllers/plugin.ts
@@ -3,6 +3,7 @@ import {
   extractPluginTarball,
   createNpmPlugin,
   createUrlPlugin,
+  createGithubPlugin,
 } from "../../utilities/fileSystem"
 import { getGlobalDB } from "@budibase/backend-core/tenancy"
 import { generatePluginID, getPluginParams } from "../../db/utils"
@@ -61,7 +62,10 @@ export async function create(ctx: any) {
       directory = directoryNpm
       break
     case "github":
-      console.log("github")
+      const { metadata: metadataGithub, directory: directoryGithub } =
+        await createGithubPlugin(ctx, url, name, githubToken)
+      metadata = metadataGithub
+      directory = directoryGithub
       break
     case "url":
       const { metadata: metadataUrl, directory: directoryUrl } =
diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js
index 710e3c0294..d8c201a380 100644
--- a/packages/server/src/utilities/fileSystem/index.js
+++ b/packages/server/src/utilities/fileSystem/index.js
@@ -31,6 +31,7 @@ const MemoryStream = require("memorystream")
 const { getAppId } = require("@budibase/backend-core/context")
 const tar = require("tar")
 const fetch = require("node-fetch")
+const { NodeVM } = require("vm2")
 
 const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..")
 const NODE_MODULES_PATH = join(TOP_LEVEL_PATH, "node_modules")
@@ -378,8 +379,69 @@ exports.createUrlPlugin = async (url, name = "", headers = {}) => {
   return await downloadUnzipPlugin(name, url, headers)
 }
 
+exports.createGithubPlugin = async (ctx, url, name = "", token = "") => {
+  let githubRepositoryUrl
+  let githubUrl
+
+  if (url.includes(".git")) {
+    githubRepositoryUrl = token
+      ? url.replace("https://", `https://${token}@`)
+      : url
+    githubUrl = url.replace(".git", "")
+  } else {
+    githubRepositoryUrl = token
+      ? `${url}.git`.replace("https://", `https://${token}@`)
+      : `${url}.git`
+    githubUrl = url
+  }
+
+  const githubApiUrl = githubUrl.replace(
+    "https://github.com/",
+    "https://api.github.com/repos/"
+  )
+  const headers = token ? { Authorization: `Bearer ${token}` } : {}
+  try {
+    const pluginRaw = await fetch(githubApiUrl, { headers })
+    if (pluginRaw.status !== 200) {
+      throw `Repository not found`
+    }
+
+    let pluginDetails = await pluginRaw.json()
+    const pluginName = pluginDetails.name || name
+
+    const path = join(budibaseTempDir(), pluginName)
+    // Remove first if exists
+    if (fs.existsSync(path)) {
+      fs.rmSync(path, { recursive: true, force: true })
+    }
+    fs.mkdirSync(path)
+
+    const script = `
+module.exports = async () => {
+  const child_process = require('child_process')
+  child_process.execSync(\`git clone ${githubRepositoryUrl} ${join(
+      budibaseTempDir(),
+      pluginName
+    )}\`);
+}
+`
+    const scriptRunner = new NodeVM({
+      require: {
+        external: true,
+        builtin: ["child_process"],
+        root: "./",
+      },
+    }).run(script)
+
+    await scriptRunner()
+
+    return await getPluginMetadata(path)
+  } catch (e) {
+    throw e.message
+  }
+}
+
 const downloadUnzipPlugin = async (name, url, headers = {}) => {
-  console.log(name, url, headers)
   const path = join(budibaseTempDir(), name)
   try {
     // Remove first if exists
@@ -407,7 +469,6 @@ const downloadUnzipPlugin = async (name, url, headers = {}) => {
 exports.downloadUnzipPlugin = downloadUnzipPlugin
 
 const getPluginMetadata = async path => {
-  console.log(path)
   let metadata = {}
   try {
     const pkg = fs.readFileSync(join(path, "package.json"), "utf8")