diff --git a/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/workspace.tmpl.xml b/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/workspace.tmpl.xml
index 9727844b..88bc6322 100644
--- a/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/workspace.tmpl.xml
+++ b/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/workspace.tmpl.xml
@@ -30,7 +30,7 @@
         <property name="settings.editor.selected.configurable"
                   value="reference.settingsdialog.IDE.editor.colors.Console Font"/>
     </component>
-    <component name="RunManager" selected="Go Build.{{.ProjectName}} (dev)">>
+    <component name="RunManager" selected="Go Build.{{.ProjectName}} (debug)">>
         <configuration name="{{.ProjectName}} (dev)" type="GoApplicationRunConfiguration" factoryName="Go Application">
             <module name="{{.ProjectName}}"/>
             <working_directory value="$PROJECT_DIR$"/>
@@ -45,6 +45,22 @@
             <method v="2">
             </method>
         </configuration>
+        <configuration name="{{.ProjectName}} (debug)" type="GoApplicationRunConfiguration"
+                       factoryName="Go Application">
+            <module name="{{.ProjectName}}"/>
+            <working_directory value="$PROJECT_DIR$"/>
+            <go_parameters
+                    value="-ldflags &quot;{{.WindowsFlags}}&quot; -tags desktop,production,debug -o {{.PathToDesktopBinary}}"/>
+            <useCustomBuildTags value="true"/>
+            <envs>
+                <env name="CGO_ENABLED" value="&quot;{{.CGOEnabled}}&quot;"/>
+            </envs>
+            <kind value="DIRECTORY"/>
+            <directory value="$PROJECT_DIR$"/>
+            <filePath value="$PROJECT_DIR$"/>
+            <method v="2">
+            </method>
+        </configuration>
         <configuration name="{{.ProjectName}} (production)" type="GoApplicationRunConfiguration"
                        factoryName="Go Application">
             <module name="{{.ProjectName}}"/>
diff --git a/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/launch.tmpl.json b/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/launch.tmpl.json
index 005f9bc4..53083108 100644
--- a/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/launch.tmpl.json
+++ b/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/launch.tmpl.json
@@ -2,7 +2,7 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Wails: Debug {{.ProjectName}}",
+      "name": "Wails: Production {{.ProjectName}}",
       "type": "go",
       "request": "launch",
       "mode": "exec",
@@ -10,6 +10,16 @@
       "preLaunchTask": "build",
       "cwd": "${workspaceFolder}",
       "env": {}
+    },
+    {
+      "name": "Wails: Debug {{.ProjectName}}",
+      "type": "go",
+      "request": "launch",
+      "mode": "exec",
+      "program": "${workspaceFolder}/{{.PathToDesktopBinary}}",
+      "preLaunchTask": "build debug",
+      "cwd": "${workspaceFolder}",
+      "env": {}
     }
   ]
 }
\ No newline at end of file
diff --git a/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/tasks.tmpl.json b/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/tasks.tmpl.json
index 03c37e11..a085ec3a 100644
--- a/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/tasks.tmpl.json
+++ b/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/tasks.tmpl.json
@@ -11,7 +11,24 @@
       "args": [
         "build",
         "-tags",
-        "dev",
+        "production,desktop",
+        "-gcflags",
+        "all=-N -l",
+        "-o",
+        "{{.PathToDesktopBinary}}"
+      ]
+    },
+    {
+      "label": "build debug",
+      "type": "shell",
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
+      "command": "go",
+      "args": [
+        "build",
+        "-tags",
+        "production,desktop,debug",
         "-gcflags",
         "all=-N -l",
         "-o",