diff --git a/knative-build/README.md b/knative-build/README.md
index c717411..a0b94dc 100644
--- a/knative-build/README.md
+++ b/knative-build/README.md
@@ -162,7 +162,8 @@
 ## Clone this repository
 
 ```bash
-$ git clone https://github.com/mrutkows/openwhisk-knative-build.git
+$ git clone https://github.com/apache/incubator-openwhisk-devtools.git
+$ cd knative-build
 ```
 
 ## Register Secrets for Docker Hub
diff --git a/knative-build/runtimes/javascript/README.md b/knative-build/runtimes/javascript/README.md
index 972ebc5..a1da655 100644
--- a/knative-build/runtimes/javascript/README.md
+++ b/knative-build/runtimes/javascript/README.md
@@ -201,7 +201,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/mrutkows/openwhisk-knative-build.git"
+      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-nodejs-runtime
@@ -209,7 +209,7 @@
       - name: TARGET_IMAGE_NAME
         value: "docker.io/${DOCKER_USERNAME}/nodejs-10-helloworld"
       - name: DOCKERFILE
-        value: "./runtimes/javascript/Dockerfile"
+        value: "./knative-build/runtimes/javascript/Dockerfile"
       - name: OW_DEBUG
         value: "true"
       - name: OW_ACTION_NAME
diff --git a/knative-build/runtimes/javascript/tests/helloworld/build.yaml.tmpl b/knative-build/runtimes/javascript/tests/helloworld/build.yaml.tmpl
index 4e9c1a7..43489ec 100644
--- a/knative-build/runtimes/javascript/tests/helloworld/build.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/helloworld/build.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/mrutkows/openwhisk-knative-build.git"
+      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-nodejs-runtime
@@ -14,7 +14,7 @@
       - name: TARGET_IMAGE_NAME
         value: "docker.io/${DOCKER_USERNAME}/nodejs-10-helloworld"
       - name: DOCKERFILE
-        value: "./runtimes/javascript/Dockerfile"
+        value: "./knative-build/runtimes/javascript/Dockerfile"
       - name: OW_RUNTIME_DEBUG
         value: "true"
       - name: OW_ACTION_NAME
diff --git a/knative-build/runtimes/javascript/tests/helloworldwithparams/build.yaml.tmpl b/knative-build/runtimes/javascript/tests/helloworldwithparams/build.yaml.tmpl
index c4cf76e..97e8e3e 100644
--- a/knative-build/runtimes/javascript/tests/helloworldwithparams/build.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/helloworldwithparams/build.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/mrutkows/openwhisk-knative-build.git"
+      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-nodejs-runtime
@@ -14,7 +14,7 @@
       - name: TARGET_IMAGE_NAME
         value: "docker.io/${DOCKER_USERNAME}/nodejs-10-helloworld-with-params"
       - name: DOCKERFILE
-        value: "./runtimes/javascript/Dockerfile"
+        value: "./knative-build/runtimes/javascript/Dockerfile"
       - name: OW_RUNTIME_DEBUG
         value: "true"
       - name: OW_ACTION_NAME
diff --git a/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build.yaml.tmpl b/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build.yaml.tmpl
index 4787e55..b4beb64 100644
--- a/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/helloworldwithparamsfromenv/build.yaml.tmpl
@@ -6,7 +6,7 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/mrutkows/openwhisk-knative-build.git"
+      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
       revision: "master"
   template:
     name: openwhisk-nodejs-runtime
@@ -14,7 +14,7 @@
       - name: TARGET_IMAGE_NAME
         value: "docker.io/${DOCKER_USERNAME}/nodejs-10-helloworld-with-params-from-env"
       - name: DOCKERFILE
-        value: "./runtimes/javascript/Dockerfile"
+        value: "./knative-build/runtimes/javascript/Dockerfile"
       - name: OW_RUNTIME_DEBUG
         value: "true"
       - name: OW_ACTION_NAME
diff --git a/knative-build/runtimes/javascript/tests/webactionhelloworld/build.yaml.tmpl b/knative-build/runtimes/javascript/tests/webactionhelloworld/build.yaml.tmpl
index 6c7176f..8c7a384 100644
--- a/knative-build/runtimes/javascript/tests/webactionhelloworld/build.yaml.tmpl
+++ b/knative-build/runtimes/javascript/tests/webactionhelloworld/build.yaml.tmpl
@@ -6,15 +6,15 @@
   serviceAccountName: openwhisk-runtime-builder
   source:
     git:
-      url: "https://github.com/mrutkows/openwhisk-knative-build.git"
-      revision: "master"
+      url: "https://github.com/apache/incubator-openwhisk-devtools.git"
+  revision: "master"
   template:
     name: openwhisk-nodejs-runtime
     arguments:
       - name: TARGET_IMAGE_NAME
         value: "docker.io/${DOCKER_USERNAME}/nodejs-10-web-action-helloworld"
       - name: DOCKERFILE
-        value: "./runtimes/javascript/Dockerfile"
+        value: "./knative-build/runtimes/javascript/Dockerfile"
       - name: OW_RUNTIME_DEBUG
         value: "true"
       - name: OW_ACTION_NAME