diff --git a/devfile.yaml b/devfile.yaml
index 79c41bd97..ff28a420a 100644
--- a/devfile.yaml
+++ b/devfile.yaml
@@ -1,59 +1,94 @@
 metadata:
-  name: pitt-boot
+  name: wksp-v8y1
 projects:
-  - name: spring-boot-java
+  - name: spring-petclinic
     source:
-      location: 'git@github.com:pittar/spring-petclinic.git'
+      location: 'https://github.com/pittar/spring-petclinic'
       type: git
       branch: master
 components:
-  - id: redhat/java/latest
+  - id: redhat/java8/latest
+    type: chePlugin
+  - id: redhat/dependency-analytics/latest
     type: chePlugin
   - mountSources: true
     endpoints:
       - name: 8080/tcp
         port: 8080
-    memoryLimit: 1Gi
+    memoryLimit: 768Mi
     type: dockerimage
     volumes:
       - name: m2
-        containerPath: /home/user/.m2
+        containerPath: /home/jboss/.m2
     alias: maven
-    image: 'quay.io/eclipse/che-java8-maven:7.4.0'
+    image: 'registry.redhat.io/codeready-workspaces/stacks-java-rhel8:2.0'
     env:
-      - value: /home/user/.m2
-        name: MAVEN_CONFIG
       - value: >-
-          -XX:MaxRAMPercentage=50 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10
-          -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4
-          -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true
-          -Xms20m -Djava.security.egd=file:/dev/./urandom -Duser.home=/home/user
-        name: MAVEN_OPTS
-      - value: >-
-          -XX:MaxRAMPercentage=50 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10
+          -XX:MaxRAMPercentage=50.0 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10
           -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4
           -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true
           -Xms20m -Djava.security.egd=file:/dev/./urandom
+          -Duser.home=/home/jboss
         name: JAVA_OPTS
-      - value: >-
-          -XX:MaxRAMPercentage=50 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10
-          -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4
-          -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true
-          -Xms20m -Djava.security.egd=file:/dev/./urandom
-        name: JAVA_TOOL_OPTIONS
-  - id: redhat/dependency-analytics/latest
-    type: chePlugin
+      - value: $(JAVA_OPTS)
+        name: MAVEN_OPTS
 apiVersion: 1.0.0
 commands:
-  - name: maven build
+  - name: build
     actions:
-      - workdir: '${CHE_PROJECTS_ROOT}/spring-boot-java'
+      - workdir: '${CHE_PROJECTS_ROOT}/spring-petclinic'
         type: exec
-        command: mvn clean install
+        command: >-
+          MAVEN_OPTS="-Xmx200m" && mvn -Duser.home=${HOME} -DskipTests clean
+          install
         component: maven
-  - name: maven build and run
+  - name: Debug remote java application
     actions:
-      - workdir: '${CHE_PROJECTS_ROOT}/spring-boot-java'
+      - referenceContent: |
+          {
+           "version": "0.2.0",
+           "configurations": [
+             {
+               "type": "java",
+               "name": "Debug (Attach) - Remote",
+               "request": "attach",
+               "hostName": "localhost",
+               "port": 8000
+             }]
+           }
+        type: vscode-launch
+  - name: run
+    actions:
+      - workdir: '${CHE_PROJECTS_ROOT}/spring-petclinic'
         type: exec
-        command: mvn clean install && java -jar ./target/*.jar
+        command: 'MAVEN_OPTS="-Xmx200m" && mvn -Duser.home=${HOME} spring-boot:run'
+        component: maven
+  - name: debug
+    actions:
+      - workdir: '${CHE_PROJECTS_ROOT}/spring-petclinic'
+        type: exec
+        command: >-
+          mvn  -Duser.home=${HOME} spring-boot:run -Drun.jvmArguments="-Xdebug
+          -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
+        component: maven
+  - name: test
+    actions:
+      - workdir: '${CHE_PROJECTS_ROOT}/spring-petclinic'
+        type: exec
+        command: 'MAVEN_OPTS="-Xmx200m" && mvn -Duser.home=${HOME} verify'
+        component: maven
+  - name: dependency-analysis
+    actions:
+      - workdir: '${CHE_PROJECTS_ROOT}/spring-petclinic'
+        type: exec
+        command: >-
+          ${HOME}/stack-analysis.sh -f
+          ${CHE_PROJECTS_ROOT}/spring-petclinic/pom.xml -p
+          ${CHE_PROJECTS_ROOT}/spring-petclinic
+        component: maven
+  - name: deploy to OpenShift
+    actions:
+      - workdir: '${CHE_PROJECTS_ROOT}/spring-petclinic'
+        type: exec
+        command: 'mvn fabric8:deploy -Popenshift -DskipTests'
         component: maven