diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000000..0b5c91d4daf
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,12 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Debug (Attach) - Remote",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": 5005
+        }
+    ]
+}
diff --git a/devfile.yaml b/devfile.yaml
index a6075199cc2..aa0b3ce9b07 100644
--- a/devfile.yaml
+++ b/devfile.yaml
@@ -37,9 +37,16 @@ commands:
       component: tools
       workingDir: ${PROJECTS_ROOT}/java-spring-petclinic
       commandLine: >-
-        java -jar -Xdebug
-        -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
-        target/*.jar
+        java -jar target/*.jar
+      group:
+        kind: run
+        isDefault: true
+  - id: run-debug
+    exec:
+      component: tools
+      workingDir: ${PROJECTS_ROOT}/java-spring-petclinic
+      commandLine: >-
+        java -jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 target/*.jar
       group:
         kind: run
         isDefault: true