diff --git a/stacks/java-maven/1.3.0/devfile.yaml b/stacks/java-maven/1.3.0/devfile.yaml
index 7cbb72ef..ca0f0b99 100644
--- a/stacks/java-maven/1.3.0/devfile.yaml
+++ b/stacks/java-maven/1.3.0/devfile.yaml
@@ -14,7 +14,7 @@ starterProjects:
   - name: springbootproject
     git:
       remotes:
-        origin: 'https://github.com/devfile-samples/springboot-ex.git'
+        origin: 'https://github.com/odo-devfiles/springboot-ex.git'
 components:
   - name: tools
     container:
diff --git a/stacks/java-maven/1.3.1/devfile.yaml b/stacks/java-maven/1.3.1/devfile.yaml
index 90531055..c651298b 100644
--- a/stacks/java-maven/1.3.1/devfile.yaml
+++ b/stacks/java-maven/1.3.1/devfile.yaml
@@ -14,7 +14,7 @@ starterProjects:
   - name: springbootproject
     git:
       remotes:
-        origin: 'https://github.com/devfile-samples/springboot-ex.git'
+        origin: 'https://github.com/odo-devfiles/springboot-ex.git'
 components:
   - name: tools
     container:
diff --git a/stacks/java-springboot/1.2.0/devfile.yaml b/stacks/java-springboot/1.2.0/devfile.yaml
index b8370d25..46bbd871 100644
--- a/stacks/java-springboot/1.2.0/devfile.yaml
+++ b/stacks/java-springboot/1.2.0/devfile.yaml
@@ -15,7 +15,7 @@ starterProjects:
   - name: springbootproject
     git:
       remotes:
-        origin: "https://github.com/devfile-samples/springboot-ex.git"
+        origin: "https://github.com/odo-devfiles/springboot-ex.git"
 components:
   - name: tools
     container:
diff --git a/stacks/java-springboot/1.3.0/devfile.yaml b/stacks/java-springboot/1.3.0/devfile.yaml
index 3f864090..da38e6fc 100644
--- a/stacks/java-springboot/1.3.0/devfile.yaml
+++ b/stacks/java-springboot/1.3.0/devfile.yaml
@@ -15,7 +15,7 @@ starterProjects:
   - name: springbootproject
     git:
       remotes:
-        origin: "https://github.com/devfile-samples/springboot-ex.git"
+        origin: "https://github.com/odo-devfiles/springboot-ex.git"
 components:
   - name: tools
     container:
diff --git a/stacks/java-springboot/1.4.0/devfile.yaml b/stacks/java-springboot/1.4.0/devfile.yaml
index bd3211ff..a5bea664 100644
--- a/stacks/java-springboot/1.4.0/devfile.yaml
+++ b/stacks/java-springboot/1.4.0/devfile.yaml
@@ -15,7 +15,7 @@ starterProjects:
   - name: springbootproject
     git:
       remotes:
-        origin: "https://github.com/devfile-samples/springboot-ex.git"
+        origin: "https://github.com/odo-devfiles/springboot-ex.git"
 components:
   - name: tools
     container:
diff --git a/stacks/java-springboot/2.0.0/devfile.yaml b/stacks/java-springboot/2.0.0/devfile.yaml
index a0196217..1a6162e0 100644
--- a/stacks/java-springboot/2.0.0/devfile.yaml
+++ b/stacks/java-springboot/2.0.0/devfile.yaml
@@ -15,7 +15,7 @@ starterProjects:
   - name: springbootproject
     git:
       remotes:
-        origin: "https://github.com/devfile-samples/springboot-ex.git"
+        origin: "https://github.com/odo-devfiles/springboot-ex.git"
 components:
   - name: tools
     container:
diff --git a/stacks/java-springboot/2.1.0/devfile.yaml b/stacks/java-springboot/2.1.0/devfile.yaml
index aab133d4..7d1a0d74 100644
--- a/stacks/java-springboot/2.1.0/devfile.yaml
+++ b/stacks/java-springboot/2.1.0/devfile.yaml
@@ -15,7 +15,7 @@ starterProjects:
   - name: springbootproject
     git:
       remotes:
-        origin: "https://github.com/devfile-samples/springboot-ex.git"
+        origin: "https://github.com/odo-devfiles/springboot-ex.git"
 components:
   - name: tools
     container:
diff --git a/stacks/java-springboot/2.2.0/devfile.yaml b/stacks/java-springboot/2.2.0/devfile.yaml
index 68a21f2c..c992d1ed 100644
--- a/stacks/java-springboot/2.2.0/devfile.yaml
+++ b/stacks/java-springboot/2.2.0/devfile.yaml
@@ -15,7 +15,7 @@ starterProjects:
   - name: springbootproject
     git:
       remotes:
-        origin: "https://github.com/devfile-samples/springboot-ex.git"
+        origin: "https://github.com/odo-devfiles/springboot-ex.git"
 components:
   - name: tools
     container: