diff --git a/stacks/java-maven/1.3.0/devfile.yaml b/stacks/java-maven/1.3.0/devfile.yaml
index ca0f0b99..7cbb72ef 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/odo-devfiles/springboot-ex.git'
+        origin: 'https://github.com/devfile-samples/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 c651298b..90531055 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/odo-devfiles/springboot-ex.git'
+        origin: 'https://github.com/devfile-samples/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 46bbd871..b8370d25 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/odo-devfiles/springboot-ex.git"
+        origin: "https://github.com/devfile-samples/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 da38e6fc..3f864090 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/odo-devfiles/springboot-ex.git"
+        origin: "https://github.com/devfile-samples/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 a5bea664..bd3211ff 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/odo-devfiles/springboot-ex.git"
+        origin: "https://github.com/devfile-samples/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 1a6162e0..a0196217 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/odo-devfiles/springboot-ex.git"
+        origin: "https://github.com/devfile-samples/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 7d1a0d74..aab133d4 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/odo-devfiles/springboot-ex.git"
+        origin: "https://github.com/devfile-samples/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 c992d1ed..68a21f2c 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/odo-devfiles/springboot-ex.git"
+        origin: "https://github.com/devfile-samples/springboot-ex.git"
 components:
   - name: tools
     container: